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

Commit 353dfbb4 authored by Dennis Shen's avatar Dennis Shen
Browse files

update aconfig lib setup for host test 

Test targets should use test variant of aconfig lib. especially those
that are run on host. There is no storage backend on host, therefore
using prod codegen will not work properly.

Change-Id: I27b04f030fc70f64dbf890387ffb61a467623b9e
parent 21883171

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",