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

Commit 2fbc214a 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 

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



Change-Id: I77eb690b1e630ba57a5240a3e327943276fbe233
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3aa8f11 35918fe8

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
@@ -265,8 +265,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",