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

Commit ddaf1f9b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "update aconfig lib setup for host test" into main am: 35918fe8 am: 2fbc214a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3272796



Change-Id: I97b771e0d480c7ead4c649b28017f53e98ad6636
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e696f34 2fbc214a

camera/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -54,7 +54,13 @@ aconfig_declarations { 
cc_aconfig_library {

    name: "camera_platform_flags_c_lib",

    aconfig_declarations: "camera_platform_flags",

}



cc_aconfig_library {

    name: "camera_platform_flags_c_lib_for_test",

    aconfig_declarations: "camera_platform_flags",

    host_supported: true,

    mode: "test",

}



java_aconfig_library {

services/camera/libcameraservice/Android.bp

+13 −1
Original line number Diff line number Diff line
@@ -267,8 +267,20 @@ cc_library_static { 
        "liblog",

        "libutils",

        "libxml2",

    ],



    target: {

        android: {

            shared_libs: [

                "camera_platform_flags_c_lib",

            ],

        },

        host: {

            shared_libs: [

                "camera_platform_flags_c_lib_for_test",

            ],

        },

    },



    include_dirs: [

        "frameworks/av/camera/include",

services/camera/libcameraservice/tests/Android.bp

+13 −1
Original line number Diff line number Diff line
@@ -44,13 +44,25 @@ cc_defaults { 
        "libjpeg",

        "liblog",

        "libutils",

        "camera_platform_flags_c_lib",

    ],



    static_libs: [

        "libgmock",

    ],



    target: {

        android: {

            shared_libs: [

                "camera_platform_flags_c_lib",

            ],

        },

        host: {

            shared_libs: [

                "camera_platform_flags_c_lib_for_test",

            ],

        },

    },



    cflags: [

        "-Wall",

        "-Wextra",