Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 961cb89b authored by Zachary Iqbal's avatar Zachary Iqbal Committed by Sasha Smundak
Browse files

Exposed Android.bp shared library target for libcamera2ndki (cherrypick) 

The cherrypcik includes adjustments due to the differences in the
orignal Android.mk file.

Bug: 118434782
Test: m -j32
Change-Id: Iea501d8a54b8cbda2c5ab22fd91247577e304ce0
Merged-In: Iea501d8a54b8cbda2c5ab22fd91247577e304ce0
parent 894180e0

camera/ndk/Android.bp

+40 −0
Original line number Diff line number Diff line
@@ -30,3 +30,43 @@ ndk_headers { 
    srcs: ["include/camera/**/*.h"],

    license: "NOTICE",

}



cc_library_shared {

    name: "libcamera2",

    srcs: [

        "NdkCameraManager.cpp",

        "NdkCameraMetadata.cpp",

        "NdkCameraDevice.cpp",

        "NdkCaptureRequest.cpp",

        "NdkCameraCaptureSession.cpp",

        "impl/ACameraManager.cpp",

        "impl/ACameraMetadata.cpp",

        "impl/ACameraDevice.cpp",

        "impl/ACameraCaptureSession.cpp",

    ],

    shared_libs: [

        "libbinder",

        "liblog",

        "libgui",

        "libutils",

        "libandroid_runtime",

        "libcamera_client",

        "libstagefright_foundation",

        "libcutils",

        "libcamera_metadata",

        "libmediandk",

    ],

    cflags: [

        "-fvisibility=hidden",

        "-DEXPORT=__attribute__ ((visibility (\"default\")))",

        "-Wall",

        "-Wextra",

        "-Werror",

    ],

    export_include_dirs: ["include"],

    product_variables: {

        pdk: {

            enabled: false,

        },

    },

}

camera/ndk/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
# limitations under the License.

#



# TODO(b/118434782): Remove this file and change name of the libcamera2

# module in the existing Android.bp file to libcamera2ndk.

LOCAL_PATH:= $(call my-dir)



ifneq ($(TARGET_BUILD_PDK), true)