diff options
| author | 2023-05-23 16:00:04 +0000 | |
|---|---|---|
| committer | 2023-05-23 16:00:04 +0000 | |
| commit | a0770f74c13a2d3979a37712e5c10e680a587225 (patch) | |
| tree | 0d3af1bc7d308b6dc6c0e71fab0fa832953dbddf | |
| parent | 1a2ab4f88b927c2efb28bd1955da60bf8b46e7e8 (diff) | |
| parent | 39fe2cc12d2bf9c1444e93738f047c7ebe351e9f (diff) | |
Merge "Change libidmap2_policies to static"
| -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 9988a7dbc3fd..55ec7dae16b1 100644 --- a/cmds/idmap2/Android.bp +++ b/cmds/idmap2/Android.bp @@ -84,13 +84,13 @@ cc_library { enabled: false, }, static_libs: [ + "libidmap2_policies", "libidmap2_protos", ], shared_libs: [ "libandroidfw", "libbase", "libcutils", - "libidmap2_policies", "libprotobuf-cpp-lite", "libutils", "libz", @@ -129,7 +129,7 @@ cc_library { }, } -cc_library { +cc_library_static { name: "libidmap2_policies", defaults: [ "idmap2_defaults", @@ -146,9 +146,6 @@ cc_library { ], }, host: { - shared: { - enabled: false, - }, static_libs: [ "libandroidfw", ], @@ -195,7 +192,6 @@ cc_test { "libandroidfw", "libbase", "libidmap2", - "libidmap2_policies", "liblog", "libprotobuf-cpp-lite", "libutils", @@ -203,6 +199,9 @@ cc_test { "libz", "libziparchive", ], + static_libs: [ + "libidmap2_policies", + ], }, host: { static_libs: [ @@ -259,12 +258,14 @@ cc_binary { "libbase", "libcutils", "libidmap2", - "libidmap2_policies", "libprotobuf-cpp-lite", "libutils", "libz", "libziparchive", ], + static_libs: [ + "libidmap2_policies", + ], }, host: { static_libs: [ @@ -302,13 +303,13 @@ cc_binary { "libbinder", "libcutils", "libidmap2", - "libidmap2_policies", "libprotobuf-cpp-lite", "libutils", "libziparchive", ], static_libs: [ "libc++fs", + "libidmap2_policies", "libidmap2_protos", "libidmap2daidl", ], |