Merge changes I85a02ec9,Ia5e4efd2,I35b38cf4,I0533caf0,Ieafeebcf, ... into main

* changes:
  Remove jni deps of apps
  Remove required deps of libaudiohal
  Remove mainline modules
  Remove cf modules
  Remove required deps of update_engine
  Remove required deps of dumpstate
  Remove transitive deps of libaudio

1 files changed, 22 insertions, 123 deletions

diff --git a/system_image/Android.bp b/system_image/Android.bp
index f1ad130dd..c8347dd71 100644
--- a/system_image/Android.bp
+++ b/system_image/Android.bp
@@ -278,11 +278,32 @@ phony {
 
 android_system_image {
     name: "aosp_cf_system_x86_64",
+
+    partition_name: "system",
+    base_dir: "system",
+    dirs: android_rootdirs,
+    symlinks: android_symlinks,
+    file_contexts: ":plat_file_contexts",
+    linker_config_src: "linker.config.json",
+    fsverity: {
+        inputs: [
+            "etc/boot-image.prof",
+            "etc/dirty-image-objects",
+            "etc/preloaded-classes",
+            "etc/classpaths/*.pb",
+            "framework/*",
+            "framework/*/*", // framework/{arch}
+            "framework/oat/*/*", // framework/oat/{arch}
+        ],
+        libs: [":framework-res{.export-package.apk}"],
+    },
+    build_logtags: true,
+
     use_avb: true,
     avb_private_key: ":microdroid_sign_key",
     avb_algorithm: "SHA256_RSA4096",
     avb_hash_algorithm: "sha256",
-    partition_name: "system",
+
     deps: [
         "abx",
         "aconfigd",
@@ -296,9 +317,7 @@ android_system_image {
         "appops",
         "appwidget",
         "atrace",
-        "audio.primary.default",
         "audioserver",
-        "av-audio-types-aidl-V1-ndk",
         "bcc",
         "blank_screen",
         "blkid",
@@ -308,18 +327,14 @@ android_system_image {
         "boringssl_self_test",
         "bpfloader",
         "bu",
-        "bugreport_procdump",
         "bugreport",
         "bugreportz",
-        "cacerts",
         "cameraserver",
         "cgroups.json",
-        "checkpoint_gc",
         "cmd",
         "content",
         "cppreopts.sh",
         "credstore",
-        "cuttlefish_sensor_injection",
         "debuggerd",
         "device_config",
         "dirty-image-objects",
@@ -344,10 +359,6 @@ android_system_image {
         "fsck_msdos",
         "fsck.erofs",
         "fsck.f2fs",
-        "fstab.cf.ext4.cts",
-        "fstab.cf.ext4.hctr2",
-        "fstab.cf.f2fs.cts",
-        "fstab.cf.f2fs.hctr2",
         "fstab.postinstall",
         "fsverity_init",
         "fsverity-release-cert-der",
@@ -363,7 +374,6 @@ android_system_image {
         "hiddenapi-package-whitelist.xml",
         "hidl_lazy_cb_test_server",
         "hidl_lazy_test_server",
-        "hwservicemanager",
         "idc_data",
         "idmap2",
         "idmap2d",
@@ -393,34 +403,19 @@ android_system_image {
         "keystore_cli_v2",
         "keystore2",
         "ld.mc",
-        "lib_renderControl_enc",
         "libaaudio",
         "libalarm_jni",
         "libamidi",
         "libandroid_runtime",
         "libandroid_servers",
         "libandroid",
-        "libandroidemu",
         "libandroidfw",
         "libartpalette-system",
         "libasyncio",
-        "libasyncio",
-        "libaudio_aidl_conversion_common_ndk_cpp",
-        "libaudio_aidl_conversion_common_ndk",
-        "libaudio_aidl_conversion_common_ndk",
-        "libaudio_aidl_conversion_core_ndk",
-        "libaudio_aidl_conversion_effect_ndk",
         "libaudio-resampler",
-        "libaudioaidlcommon",
-        "libaudioaidlcommon",
         "libaudioeffect_jni",
         "libaudiohal_deathhandler",
         "libaudiohal",
-        "libaudiohal@5.0",
-        "libaudiohal@6.0",
-        "libaudiohal@7.0",
-        "libaudiohal@7.1",
-        "libaudiohal@aidl",
         "libaudiopolicyengineconfigurable",
         "libaudiopreprocessing",
         "libaudioutils",
@@ -452,7 +447,6 @@ android_system_image {
         "libeffects",
         "libeffectsconfig",
         "libEGL_angle",
-        "libEGL_emulation",
         "libEGL",
         "libepoxy",
         "libETC1",
@@ -468,12 +462,8 @@ android_system_image {
         "libgatekeeper",
         "libgbm",
         "libGLESv1_CM_angle",
-        "libGLESv1_CM_emulation",
         "libGLESv1_CM",
-        "libGLESv1_enc",
         "libGLESv2_angle",
-        "libGLESv2_emulation",
-        "libGLESv2_enc",
         "libGLESv2",
         "libGLESv3",
         "libgralloctypes",
@@ -512,10 +502,7 @@ android_system_image {
         "libnetlink",
         "libnetutils",
         "libneuralnetworks_packageinfo",
-        "libnfc_nci_jni",
         "libnl",
-        "libOpenglCodecCommon",
-        "libOpenglSystemCommon",
         "libOpenMAXAL",
         "libOpenSLES",
         "libpdfium",
@@ -523,7 +510,6 @@ android_system_image {
         "libpolicy-subsystem",
         "libpower",
         "libpowermanager",
-        "libprintspooler_jni",
         "libprocessgroup_setup",
         "libprotobuf-cpp-full",
         "libradio_metadata",
@@ -585,7 +571,6 @@ android_system_image {
         "lpdumpd",
         "lshal",
         "make_f2fs",
-        "mapper.minigbm",
         "mdnsd",
         "media_profiles_V1_0.dtd",
         "mediacodec.policy",
@@ -729,57 +714,12 @@ android_system_image {
                 "com.android.cellbroadcast",
                 "com.android.compos",
                 "com.android.future.usb.accessory",
-                "com.android.hardware.authsecret",
-                "com.android.hardware.biometrics.face.virtual",
-                "com.android.hardware.biometrics.fingerprint.virtual",
-                "com.android.hardware.boot",
-                "com.android.hardware.cas",
-                "com.android.hardware.contexthub",
-                "com.android.hardware.dumpstate",
-                "com.android.hardware.gnss",
-                "com.android.hardware.input.processor",
-                "com.android.hardware.keymint.rust_cf_remote",
-                "com.android.hardware.keymint.rust_nonsecure",
-                "com.android.hardware.memtrack",
-                "com.android.hardware.net.nlinterceptor",
-                "com.android.hardware.neuralnetworks",
-                "com.android.hardware.power",
-                "com.android.hardware.rebootescrow",
-                "com.android.hardware.secure_element",
-                "com.android.hardware.security.authgraph",
-                "com.android.hardware.sensors",
-                "com.android.hardware.tetheroffload",
-                "com.android.hardware.thermal",
-                "com.android.hardware.threadnetwork",
-                "com.android.hardware.usb",
-                "com.android.hardware.uwb",
-                "com.android.hardware.vibrator",
-                "com.android.hardware.wifi",
-                "com.android.i18n",
-                "com.android.ipsec",
-                "com.android.hardware.gatekeeper.cf_remote",
-                "com.android.hardware.gatekeeper.nonsecure",
-                "com.android.hardware.keymint.rust_cf_remote",
-                "com.android.hardware.keymint.rust_nonsecure",
                 "com.android.location.provider",
                 "com.android.media.remotedisplay.xml",
                 "com.android.media.remotedisplay",
                 "com.android.mediadrm.signer",
                 "com.android.nfc_extras",
                 "com.android.runtime",
-                "com.google.cf.bt",
-                "com.google.cf.confirmationui",
-                "com.google.cf.health.storage",
-                "com.google.cf.health",
-                "com.google.cf.identity",
-                "com.google.cf.input.config",
-                "com.google.cf.ir",
-                "com.google.cf.light",
-                "com.google.cf.nfc",
-                "com.google.cf.oemlock",
-                "com.google.cf.rild",
-                "com.google.cf.vulkan",
-                "com.google.cf.wifi",
                 "CompanionDeviceManager",
                 "Contacts",
                 "ContactsProvider",
@@ -893,34 +833,6 @@ android_system_image {
             ],
         },
     },
-    base_dir: "system",
-    dirs: android_rootdirs,
-    symlinks: android_symlinks,
-    file_contexts: ":plat_file_contexts",
-    linker_config_src: "linker.config.json",
-    arch: {
-        x86: {
-            multilib: {
-                common: {
-                    deps: [
-                        "com.android.wifi",
-                    ],
-                },
-            },
-        },
-        x86_64: {
-            deps: [
-                "libgfxstream_backend",
-            ],
-            multilib: {
-                common: {
-                    deps: [
-                        "com.android.wifi",
-                    ],
-                },
-            },
-        },
-    },
     product_variables: {
         debuggable: {
             deps: [
@@ -967,19 +879,6 @@ android_system_image {
             ],
         },
     },
-    fsverity: {
-        inputs: [
-            "etc/boot-image.prof",
-            "etc/dirty-image-objects",
-            "etc/preloaded-classes",
-            "etc/classpaths/*.pb",
-            "framework/*",
-            "framework/*/*", // framework/{arch}
-            "framework/oat/*/*", // framework/oat/{arch}
-        ],
-        libs: [":framework-res{.export-package.apk}"],
-    },
-    build_logtags: true,
 }
 
 prebuilt_etc {