Move binaries to multi/both in soong system image
Binaries that have both variants must be in multi/both dependents.
Also add a missing app to the dep list.
Bug: 314933937
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug \
&& m aosp_cf_system_x86_64
Change-Id: I6160ce6fa017f6742e71cad2e7346803274d0d27
diff --git a/system_image/Android.bp b/system_image/Android.bp
index 715d0bb..12b2433 100644
--- a/system_image/Android.bp
+++ b/system_image/Android.bp
@@ -321,7 +321,6 @@
"android_vintf_manifest",
"android.system.suspend-service",
"apexd",
- "app_process",
"appops",
"appwidget",
"atrace",
@@ -332,7 +331,6 @@
"bmgr",
"bootanimation",
"bootstat",
- "boringssl_self_test",
"bpfloader",
"bu",
"bugreport",
@@ -402,7 +400,6 @@
"libaaudio",
"libalarm_jni",
"libamidi",
- "linker", // ok
"llkd", // base_system
"lmkd", // base_system
"local_time.default", // handheld_vendo
@@ -583,6 +580,7 @@
"DownloadProvider", // base_system
"DownloadProviderUi", // handheld_system
"DynamicSystemInstallationService", // base_system
+ "E2eeContactKeysProvider", // base_system
"EasterEgg", // handheld_system
"ext", // from runtime_libart
"ExternalStorageProvider", // handheld_system
@@ -657,13 +655,14 @@
},
lib64: {
deps: [
- "boringssl_self_test",
"libgsi",
"servicemanager",
],
},
both: {
deps: [
+ "app_process", // base_system
+ "boringssl_self_test", // base_system
"libandroid_runtime",
"libandroid_servers",
"libandroid",
@@ -752,6 +751,7 @@
"libwebviewchromium_loader", // media_system
"libwebviewchromium_plat_support", // media_system
"libwilhelm", // base_system
+ "linker", // base_system
] + select(soong_config_variable("ANDROID", "TARGET_DYNAMIC_64_32_DRMSERVER"), {
"true": ["drmserver"],
default: [],
