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

Commit 892ab6a4 authored by Devin Moore's avatar Devin Moore Committed by Android (Google) Code Review
Browse files

Merge "cameraserver: move some libs from shared to static"

parents e6743525 65ca53fb

camera/cameraserver/Android.bp

+7 −6
Original line number Diff line number Diff line
@@ -26,12 +26,15 @@ cc_binary { 


    srcs: ["main_cameraserver.cpp"],



    defaults: [

        "libcameraservice_deps",

    ],



    header_libs: [

        "libmedia_headers",

    ],



    shared_libs: [

        "libcameraservice",

        "liblog",

        "libutils",

        "libui",
@@ -40,15 +43,13 @@ cc_binary { 
        "libbinder_ndk",

        "libhidlbase",

        "android.hardware.camera.common@1.0",

        "android.hardware.camera.provider@2.4",

        "android.hardware.camera.provider@2.5",

        "android.hardware.camera.provider@2.6",

        "android.hardware.camera.provider@2.7",

        "android.hardware.camera.provider-V2-ndk",

        "android.hardware.camera.device@1.0",

        "android.hardware.camera.device@3.2",

        "android.hardware.camera.device@3.4",

    ],

    static_libs: [

        "libcameraservice",

    ],

    compile_multilib: "first",

    cflags: [

        "-Wall",

services/camera/libcameraservice/Android.bp

+81 −68
Original line number Diff line number Diff line
@@ -35,9 +35,89 @@ license { 
    ],

}



cc_library_shared {

cc_defaults {

    name: "libcameraservice_deps",



    shared_libs: [

        "libactivitymanager_aidl",

        "libbase",

        "libdl",

        "libui",

        "liblog",

        "libutilscallstack",

        "libutils",

        "libbinder",

        "libbinder_ndk",

        "libactivitymanager_aidl",

        "libpermission",

        "libcutils",

        "libexif",

        "libmedia",

        "libmediautils",

        "libcamera_client",

        "libcamera_metadata",

        "libfmq",

        "libgui",

        "libhardware",

        "libhidlbase",

        "libimage_io",

        "libjpeg",

        "libultrahdr",

        "libmedia_codeclist",

        "libmedia_omx",

        "libmemunreachable",

        "libsensorprivacy",

        "libstagefright",

        "libstagefright_foundation",

        "libxml2",

        "libyuv",

        "android.hardware.camera.common@1.0",

        "android.hardware.camera.device@1.0",

        "android.hardware.camera.device@3.2",

        "android.hardware.camera.device@3.3",

        "android.hardware.camera.device@3.4",

        "android.hardware.camera.device@3.5",

        "android.hardware.camera.device@3.6",

        "android.hardware.camera.device@3.7",

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "android.hardware.graphics.common-V4-ndk",

        "media_permission-aidl-cpp",

    ],



    static_libs: [

        "android.frameworks.cameraservice.common@2.0",

        "android.frameworks.cameraservice.service@2.0",

        "android.frameworks.cameraservice.service@2.1",

        "android.frameworks.cameraservice.service@2.2",

        "android.frameworks.cameraservice.device@2.0",

        "android.frameworks.cameraservice.device@2.1",

        "android.frameworks.cameraservice.common-V1-ndk",

        "android.frameworks.cameraservice.service-V1-ndk",

        "android.frameworks.cameraservice.device-V1-ndk",

        "android.hardware.camera.common-V1-ndk",

        "android.hardware.camera.device-V2-ndk",

        "android.hardware.camera.metadata-V2-ndk",

        "android.hardware.camera.provider@2.4",

        "android.hardware.camera.provider@2.5",

        "android.hardware.camera.provider@2.6",

        "android.hardware.camera.provider@2.7",

        "android.hardware.camera.provider-V2-ndk",

        "libaidlcommonsupport",

        "libdynamic_depth",

        "libprocessinfoservice_aidl",

        "libbinderthreadstateutils",

        "media_permission-aidl-cpp",

        "libcameraservice_device_independent",

    ],

}



cc_library {

    name: "libcameraservice",



    defaults: [

        "libcameraservice_deps",

    ],

    // Camera service source



    srcs: [
@@ -119,73 +199,6 @@ cc_library_shared { 
        "libmediametrics_headers",

    ],



    shared_libs: [

        "libactivitymanager_aidl",

        "libbase",

        "libdl",

        "libexif",

        "libui",

        "liblog",

        "libutilscallstack",

        "libutils",

        "libbinder",

        "libbinder_ndk",

        "libactivitymanager_aidl",

        "libpermission",

        "libcutils",

        "libmedia",

        "libmediautils",

        "libcamera_client",

        "libcamera_metadata",

        "libdynamic_depth",

        "libfmq",

        "libgui",

        "libhardware",

        "libhidlbase",

        "libimage_io",

        "libjpeg",

        "libultrahdr",

        "libmedia_codeclist",

        "libmedia_omx",

        "libmemunreachable",

        "libsensorprivacy",

        "libstagefright",

        "libstagefright_foundation",

        "libxml2",

        "libyuv",

        "android.frameworks.cameraservice.common@2.0",

        "android.frameworks.cameraservice.service@2.0",

        "android.frameworks.cameraservice.service@2.1",

        "android.frameworks.cameraservice.service@2.2",

        "android.frameworks.cameraservice.device@2.0",

        "android.frameworks.cameraservice.device@2.1",

        "android.frameworks.cameraservice.common-V1-ndk",

        "android.frameworks.cameraservice.service-V1-ndk",

        "android.frameworks.cameraservice.device-V1-ndk",

        "android.hardware.camera.common@1.0",

        "android.hardware.camera.provider@2.4",

        "android.hardware.camera.provider@2.5",

        "android.hardware.camera.provider@2.6",

        "android.hardware.camera.provider@2.7",

        "android.hardware.camera.provider-V2-ndk",

        "android.hardware.camera.device@3.2",

        "android.hardware.camera.device@3.3",

        "android.hardware.camera.device@3.4",

        "android.hardware.camera.device@3.5",

        "android.hardware.camera.device@3.6",

        "android.hardware.camera.device@3.7",

        "android.hardware.camera.device-V2-ndk",

        "media_permission-aidl-cpp",

    ],



    static_libs: [

        "libaidlcommonsupport",

        "libprocessinfoservice_aidl",

        "libbinderthreadstateutils",

        "media_permission-aidl-cpp",

        "libcameraservice_device_independent",

    ],



    export_shared_lib_headers: [

        "libbinder",

        "libactivitymanager_aidl",

services/camera/libcameraservice/tests/Android.bp

+10 −6
Original line number Diff line number Diff line
@@ -31,11 +31,14 @@ cc_test { 
        "libmedia_headers",

    ],



    defaults: [

        "libcameraservice_deps",

    ],



    shared_libs: [

        "libbase",

        "libbinder",

        "libcutils",

        "libcameraservice",

        "libhidlbase",

        "liblog",

        "libcamera_client",
@@ -45,11 +48,6 @@ cc_test { 
        "libjpeg",

        "libexif",

        "android.hardware.camera.common@1.0",

        "android.hardware.camera.provider@2.4",

        "android.hardware.camera.provider@2.5",

        "android.hardware.camera.provider@2.6",

        "android.hardware.camera.provider@2.7",

        "android.hardware.camera.provider-V2-ndk",

        "android.hardware.camera.device@1.0",

        "android.hardware.camera.device@3.2",

        "android.hardware.camera.device@3.4",
@@ -58,6 +56,12 @@ cc_test { 
    ],



    static_libs: [

        "android.hardware.camera.provider@2.4",

        "android.hardware.camera.provider@2.5",

        "android.hardware.camera.provider@2.6",

        "android.hardware.camera.provider@2.7",

        "android.hardware.camera.provider-V2-ndk",

        "libcameraservice",

        "libgmock",

    ],