diff options
| -rw-r--r-- | cmds/idmap2/Android.bp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/cmds/idmap2/Android.bp b/cmds/idmap2/Android.bp index 5f06c971ba98..de60581564b1 100644 --- a/cmds/idmap2/Android.bp +++ b/cmds/idmap2/Android.bp @@ -80,13 +80,13 @@ cc_library { enabled: false, }, static_libs: [ + "libidmap2_policies", "libidmap2_protos", ], shared_libs: [ "libandroidfw", "libbase", "libcutils", - "libidmap2_policies", "libprotobuf-cpp-lite", "libutils", "libz", @@ -125,7 +125,7 @@ cc_library { }, } -cc_library { +cc_library_static { name: "libidmap2_policies", defaults: [ "idmap2_defaults", @@ -142,9 +142,6 @@ cc_library { ], }, host: { - shared: { - enabled: false, - }, static_libs: [ "libandroidfw", ], @@ -191,7 +188,6 @@ cc_test { "libandroidfw", "libbase", "libidmap2", - "libidmap2_policies", "liblog", "libprotobuf-cpp-lite", "libutils", @@ -199,6 +195,9 @@ cc_test { "libz", "libziparchive", ], + static_libs: [ + "libidmap2_policies", + ], }, host: { static_libs: [ @@ -255,12 +254,14 @@ cc_binary { "libbase", "libcutils", "libidmap2", - "libidmap2_policies", "libprotobuf-cpp-lite", "libutils", "libz", "libziparchive", ], + static_libs: [ + "libidmap2_policies", + ], }, host: { static_libs: [ @@ -298,13 +299,13 @@ cc_binary { "libbinder", "libcutils", "libidmap2", - "libidmap2_policies", "libprotobuf-cpp-lite", "libutils", "libziparchive", ], static_libs: [ "libc++fs", + "libidmap2_policies", "libidmap2_protos", "libidmap2daidl", ], |