Update VNDK snapshot v29 to build 5719617.

Taken from branch qt-release.

Bug: 135410459
Test: OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS=29 m -j vndk_snapshot_package
Change-Id: Ieea42f0f3ab4df8acd251062dc7b6d6ac5b99358
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..7225c3e
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,39 @@
+// THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
+// DO NOT EDIT
+
+prebuilt_etc {
+    name: "llndk.libraries.29.txt",
+    target: {
+        android_arm64: {
+            src: "arm64/configs/llndk.libraries.29.txt",
+        },
+        android_arm: {
+            src: "arm/configs/llndk.libraries.29.txt",
+        },
+        android_x86_64: {
+            src: "x86_64/configs/llndk.libraries.29.txt",
+        },
+        android_x86: {
+            src: "x86/configs/llndk.libraries.29.txt",
+        },
+    },
+}
+
+prebuilt_etc {
+    name: "vndksp.libraries.29.txt",
+    target: {
+        android_arm64: {
+            src: "arm64/configs/vndksp.libraries.29.txt",
+        },
+        android_arm: {
+            src: "arm/configs/vndksp.libraries.29.txt",
+        },
+        android_x86_64: {
+            src: "x86_64/configs/vndksp.libraries.29.txt",
+        },
+        android_x86: {
+            src: "x86/configs/vndksp.libraries.29.txt",
+        },
+    },
+}
+
diff --git a/arm/Android.bp b/arm/Android.bp
new file mode 100644
index 0000000..4405711
--- /dev/null
+++ b/arm/Android.bp
@@ -0,0 +1,4141 @@
+// THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
+// DO NOT EDIT
+
+phony {
+    name: "vndk_v29_arm",
+    required: [
+        "android.frameworks.cameraservice.common@2.0.vndk.29.arm.vendor",
+        "android.frameworks.cameraservice.device@2.0.vndk.29.arm.vendor",
+        "android.frameworks.cameraservice.service@2.0.vndk.29.arm.vendor",
+        "android.frameworks.displayservice@1.0.vndk.29.arm.vendor",
+        "android.frameworks.schedulerservice@1.0.vndk.29.arm.vendor",
+        "android.frameworks.sensorservice@1.0.vndk.29.arm.vendor",
+        "android.frameworks.stats@1.0.vndk.29.arm.vendor",
+        "android.frameworks.vr.composer@1.0.vndk.29.arm.vendor",
+        "android.hardware.atrace@1.0.vndk.29.arm.vendor",
+        "android.hardware.audio.common@2.0.vndk.29.arm.vendor",
+        "android.hardware.audio.common@4.0.vndk.29.arm.vendor",
+        "android.hardware.audio.common@5.0.vndk.29.arm.vendor",
+        "android.hardware.audio.effect@2.0.vndk.29.arm.vendor",
+        "android.hardware.audio.effect@4.0.vndk.29.arm.vendor",
+        "android.hardware.audio.effect@5.0.vndk.29.arm.vendor",
+        "android.hardware.audio@2.0.vndk.29.arm.vendor",
+        "android.hardware.audio@4.0.vndk.29.arm.vendor",
+        "android.hardware.audio@5.0.vndk.29.arm.vendor",
+        "android.hardware.authsecret@1.0.vndk.29.arm.vendor",
+        "android.hardware.automotive.audiocontrol@1.0.vndk.29.arm.vendor",
+        "android.hardware.automotive.evs@1.0.vndk.29.arm.vendor",
+        "android.hardware.automotive.vehicle@2.0.vndk.29.arm.vendor",
+        "android.hardware.biometrics.face@1.0.vndk.29.arm.vendor",
+        "android.hardware.biometrics.fingerprint@2.1.vndk.29.arm.vendor",
+        "android.hardware.bluetooth.a2dp@1.0.vndk.29.arm.vendor",
+        "android.hardware.bluetooth.audio@2.0.vndk.29.arm.vendor",
+        "android.hardware.bluetooth@1.0.vndk.29.arm.vendor",
+        "android.hardware.boot@1.0.vndk.29.arm.vendor",
+        "android.hardware.broadcastradio@1.0.vndk.29.arm.vendor",
+        "android.hardware.broadcastradio@1.1.vndk.29.arm.vendor",
+        "android.hardware.broadcastradio@2.0.vndk.29.arm.vendor",
+        "android.hardware.camera.common@1.0.vndk.29.arm.vendor",
+        "android.hardware.camera.device@1.0.vndk.29.arm.vendor",
+        "android.hardware.camera.device@3.2.vndk.29.arm.vendor",
+        "android.hardware.camera.device@3.3.vndk.29.arm.vendor",
+        "android.hardware.camera.device@3.4.vndk.29.arm.vendor",
+        "android.hardware.camera.device@3.5.vndk.29.arm.vendor",
+        "android.hardware.camera.metadata@3.2.vndk.29.arm.vendor",
+        "android.hardware.camera.metadata@3.3.vndk.29.arm.vendor",
+        "android.hardware.camera.metadata@3.4.vndk.29.arm.vendor",
+        "android.hardware.camera.provider@2.4.vndk.29.arm.vendor",
+        "android.hardware.camera.provider@2.5.vndk.29.arm.vendor",
+        "android.hardware.cas.native@1.0.vndk.29.arm.vendor",
+        "android.hardware.cas@1.0.vndk.29.arm.vendor",
+        "android.hardware.cas@1.1.vndk.29.arm.vendor",
+        "android.hardware.configstore-utils.vndk.29.arm.vendor",
+        "android.hardware.configstore@1.0.vndk.29.arm.vendor",
+        "android.hardware.configstore@1.1.vndk.29.arm.vendor",
+        "android.hardware.confirmationui-support-lib.vndk.29.arm.vendor",
+        "android.hardware.confirmationui@1.0.vndk.29.arm.vendor",
+        "android.hardware.contexthub@1.0.vndk.29.arm.vendor",
+        "android.hardware.drm@1.0.vndk.29.arm.vendor",
+        "android.hardware.drm@1.1.vndk.29.arm.vendor",
+        "android.hardware.drm@1.2.vndk.29.arm.vendor",
+        "android.hardware.dumpstate@1.0.vndk.29.arm.vendor",
+        "android.hardware.fastboot@1.0.vndk.29.arm.vendor",
+        "android.hardware.gatekeeper@1.0.vndk.29.arm.vendor",
+        "android.hardware.gnss.measurement_corrections@1.0.vndk.29.arm.vendor",
+        "android.hardware.gnss.visibility_control@1.0.vndk.29.arm.vendor",
+        "android.hardware.gnss@1.0.vndk.29.arm.vendor",
+        "android.hardware.gnss@1.1.vndk.29.arm.vendor",
+        "android.hardware.gnss@2.0.vndk.29.arm.vendor",
+        "android.hardware.graphics.allocator@2.0.vndk.29.arm.vendor",
+        "android.hardware.graphics.allocator@3.0.vndk.29.arm.vendor",
+        "android.hardware.graphics.bufferqueue@1.0.vndk.29.arm.vendor",
+        "android.hardware.graphics.bufferqueue@2.0.vndk.29.arm.vendor",
+        "android.hardware.graphics.composer@2.1.vndk.29.arm.vendor",
+        "android.hardware.graphics.composer@2.2.vndk.29.arm.vendor",
+        "android.hardware.graphics.composer@2.3.vndk.29.arm.vendor",
+        "android.hardware.health.storage@1.0.vndk.29.arm.vendor",
+        "android.hardware.health@1.0.vndk.29.arm.vendor",
+        "android.hardware.health@2.0.vndk.29.arm.vendor",
+        "android.hardware.input.classifier@1.0.vndk.29.arm.vendor",
+        "android.hardware.input.common@1.0.vndk.29.arm.vendor",
+        "android.hardware.ir@1.0.vndk.29.arm.vendor",
+        "android.hardware.keymaster@3.0.vndk.29.arm.vendor",
+        "android.hardware.keymaster@4.0.vndk.29.arm.vendor",
+        "android.hardware.light@2.0.vndk.29.arm.vendor",
+        "android.hardware.media.bufferpool@1.0.vndk.29.arm.vendor",
+        "android.hardware.media.bufferpool@2.0.vndk.29.arm.vendor",
+        "android.hardware.media.c2@1.0.vndk.29.arm.vendor",
+        "android.hardware.media.omx@1.0.vndk.29.arm.vendor",
+        "android.hardware.media@1.0.vndk.29.arm.vendor",
+        "android.hardware.memtrack@1.0.vndk.29.arm.vendor",
+        "android.hardware.neuralnetworks@1.0.vndk.29.arm.vendor",
+        "android.hardware.neuralnetworks@1.1.vndk.29.arm.vendor",
+        "android.hardware.neuralnetworks@1.2.vndk.29.arm.vendor",
+        "android.hardware.nfc@1.0.vndk.29.arm.vendor",
+        "android.hardware.nfc@1.1.vndk.29.arm.vendor",
+        "android.hardware.nfc@1.2.vndk.29.arm.vendor",
+        "android.hardware.oemlock@1.0.vndk.29.arm.vendor",
+        "android.hardware.power.stats@1.0.vndk.29.arm.vendor",
+        "android.hardware.power@1.0.vndk.29.arm.vendor",
+        "android.hardware.power@1.1.vndk.29.arm.vendor",
+        "android.hardware.power@1.2.vndk.29.arm.vendor",
+        "android.hardware.power@1.3.vndk.29.arm.vendor",
+        "android.hardware.radio.config@1.0.vndk.29.arm.vendor",
+        "android.hardware.radio.config@1.1.vndk.29.arm.vendor",
+        "android.hardware.radio.config@1.2.vndk.29.arm.vendor",
+        "android.hardware.radio.deprecated@1.0.vndk.29.arm.vendor",
+        "android.hardware.radio@1.0.vndk.29.arm.vendor",
+        "android.hardware.radio@1.1.vndk.29.arm.vendor",
+        "android.hardware.radio@1.2.vndk.29.arm.vendor",
+        "android.hardware.radio@1.3.vndk.29.arm.vendor",
+        "android.hardware.radio@1.4.vndk.29.arm.vendor",
+        "android.hardware.secure_element@1.0.vndk.29.arm.vendor",
+        "android.hardware.secure_element@1.1.vndk.29.arm.vendor",
+        "android.hardware.sensors@1.0.vndk.29.arm.vendor",
+        "android.hardware.sensors@2.0.vndk.29.arm.vendor",
+        "android.hardware.soundtrigger@2.0.vndk.29.arm.vendor",
+        "android.hardware.soundtrigger@2.0-core.vndk.29.arm.vendor",
+        "android.hardware.soundtrigger@2.1.vndk.29.arm.vendor",
+        "android.hardware.soundtrigger@2.2.vndk.29.arm.vendor",
+        "android.hardware.tetheroffload.config@1.0.vndk.29.arm.vendor",
+        "android.hardware.tetheroffload.control@1.0.vndk.29.arm.vendor",
+        "android.hardware.thermal@1.0.vndk.29.arm.vendor",
+        "android.hardware.thermal@1.1.vndk.29.arm.vendor",
+        "android.hardware.thermal@2.0.vndk.29.arm.vendor",
+        "android.hardware.tv.cec@1.0.vndk.29.arm.vendor",
+        "android.hardware.tv.cec@2.0.vndk.29.arm.vendor",
+        "android.hardware.tv.input@1.0.vndk.29.arm.vendor",
+        "android.hardware.usb.gadget@1.0.vndk.29.arm.vendor",
+        "android.hardware.usb@1.0.vndk.29.arm.vendor",
+        "android.hardware.usb@1.1.vndk.29.arm.vendor",
+        "android.hardware.usb@1.2.vndk.29.arm.vendor",
+        "android.hardware.vibrator@1.0.vndk.29.arm.vendor",
+        "android.hardware.vibrator@1.1.vndk.29.arm.vendor",
+        "android.hardware.vibrator@1.2.vndk.29.arm.vendor",
+        "android.hardware.vibrator@1.3.vndk.29.arm.vendor",
+        "android.hardware.vr@1.0.vndk.29.arm.vendor",
+        "android.hardware.weaver@1.0.vndk.29.arm.vendor",
+        "android.hardware.wifi.hostapd@1.0.vndk.29.arm.vendor",
+        "android.hardware.wifi.hostapd@1.1.vndk.29.arm.vendor",
+        "android.hardware.wifi.offload@1.0.vndk.29.arm.vendor",
+        "android.hardware.wifi.supplicant@1.0.vndk.29.arm.vendor",
+        "android.hardware.wifi.supplicant@1.1.vndk.29.arm.vendor",
+        "android.hardware.wifi.supplicant@1.2.vndk.29.arm.vendor",
+        "android.hardware.wifi@1.0.vndk.29.arm.vendor",
+        "android.hardware.wifi@1.1.vndk.29.arm.vendor",
+        "android.hardware.wifi@1.2.vndk.29.arm.vendor",
+        "android.hardware.wifi@1.3.vndk.29.arm.vendor",
+        "android.hidl.allocator@1.0.vndk.29.arm.vendor",
+        "android.hidl.memory.block@1.0.vndk.29.arm.vendor",
+        "android.hidl.token@1.0.vndk.29.arm.vendor",
+        "android.hidl.token@1.0-utils.vndk.29.arm.vendor",
+        "android.system.net.netd@1.0.vndk.29.arm.vendor",
+        "android.system.net.netd@1.1.vndk.29.arm.vendor",
+        "android.system.suspend@1.0.vndk.29.arm.vendor",
+        "android.system.wifi.keystore@1.0.vndk.29.arm.vendor",
+        "libadf.vndk.29.arm.vendor",
+        "libaudioroute.vndk.29.arm.vendor",
+        "libaudioutils.vndk.29.arm.vendor",
+        "libbinder.vndk.29.arm.vendor",
+        "libcamera_metadata.vndk.29.arm.vendor",
+        "libcap.vndk.29.arm.vendor",
+        "libclang_rt.scudo-arm-android.vndk.29.arm.vendor",
+        "libclang_rt.scudo_minimal-arm-android.vndk.29.arm.vendor",
+        "libclang_rt.ubsan_minimal-arm-android.vndk.29.arm.vendor",
+        "libclang_rt.ubsan_standalone-arm-android.vndk.29.arm.vendor",
+        "libcn-cbor.vndk.29.arm.vendor",
+        "libcodec2.vndk.29.arm.vendor",
+        "libcrypto.vndk.29.arm.vendor",
+        "libcrypto_utils.vndk.29.arm.vendor",
+        "libcurl.vndk.29.arm.vendor",
+        "libdiskconfig.vndk.29.arm.vendor",
+        "libdumpstateutil.vndk.29.arm.vendor",
+        "libevent.vndk.29.arm.vendor",
+        "libexif.vndk.29.arm.vendor",
+        "libexpat.vndk.29.arm.vendor",
+        "libfmq.vndk.29.arm.vendor",
+        "libgatekeeper.vndk.29.arm.vendor",
+        "libgui.vndk.29.arm.vendor",
+        "libhardware_legacy.vndk.29.arm.vendor",
+        "libhidlallocatorutils.vndk.29.arm.vendor",
+        "libhidlcache.vndk.29.arm.vendor",
+        "libjpeg.vndk.29.arm.vendor",
+        "libkeymaster_messages.vndk.29.arm.vendor",
+        "libkeymaster_portable.vndk.29.arm.vendor",
+        "libldacBT_abr.vndk.29.arm.vendor",
+        "libldacBT_enc.vndk.29.arm.vendor",
+        "liblz4.vndk.29.arm.vendor",
+        "libmedia_helper.vndk.29.arm.vendor",
+        "libmedia_omx.vndk.29.arm.vendor",
+        "libmemtrack.vndk.29.arm.vendor",
+        "libminijail.vndk.29.arm.vendor",
+        "libmkbootimg_abi_check.vndk.29.arm.vendor",
+        "libnetutils.vndk.29.arm.vendor",
+        "libnl.vndk.29.arm.vendor",
+        "libpcre2.vndk.29.arm.vendor",
+        "libpiex.vndk.29.arm.vendor",
+        "libpng.vndk.29.arm.vendor",
+        "libpower.vndk.29.arm.vendor",
+        "libprocinfo.vndk.29.arm.vendor",
+        "libprotobuf-cpp-full.vndk.29.arm.vendor",
+        "libprotobuf-cpp-lite.vndk.29.arm.vendor",
+        "libpuresoftkeymasterdevice.vndk.29.arm.vendor",
+        "libradio_metadata.vndk.29.arm.vendor",
+        "libselinux.vndk.29.arm.vendor",
+        "libsoftkeymasterdevice.vndk.29.arm.vendor",
+        "libspeexresampler.vndk.29.arm.vendor",
+        "libsqlite.vndk.29.arm.vendor",
+        "libssl.vndk.29.arm.vendor",
+        "libstagefright_bufferpool@2.0.vndk.29.arm.vendor",
+        "libstagefright_bufferqueue_helper.vndk.29.arm.vendor",
+        "libstagefright_foundation.vndk.29.arm.vendor",
+        "libstagefright_omx.vndk.29.arm.vendor",
+        "libstagefright_omx_utils.vndk.29.arm.vendor",
+        "libstagefright_xmlparser.vndk.29.arm.vendor",
+        "libsysutils.vndk.29.arm.vendor",
+        "libtinyalsa.vndk.29.arm.vendor",
+        "libtinyxml2.vndk.29.arm.vendor",
+        "libui.vndk.29.arm.vendor",
+        "libusbhost.vndk.29.arm.vendor",
+        "libwifi-system-iface.vndk.29.arm.vendor",
+        "libxml2.vndk.29.arm.vendor",
+        "libyuv.vndk.29.arm.vendor",
+        "libziparchive.vndk.29.arm.vendor",
+        "android.hardware.graphics.common@1.0.vndk.29.arm.vendor",
+        "android.hardware.graphics.common@1.1.vndk.29.arm.vendor",
+        "android.hardware.graphics.common@1.2.vndk.29.arm.vendor",
+        "android.hardware.graphics.mapper@2.0.vndk.29.arm.vendor",
+        "android.hardware.graphics.mapper@2.1.vndk.29.arm.vendor",
+        "android.hardware.graphics.mapper@3.0.vndk.29.arm.vendor",
+        "android.hardware.renderscript@1.0.vndk.29.arm.vendor",
+        "android.hidl.memory.token@1.0.vndk.29.arm.vendor",
+        "android.hidl.memory@1.0.vndk.29.arm.vendor",
+        "android.hidl.memory@1.0-impl.vndk.29.arm.vendor",
+        "android.hidl.safe_union@1.0.vndk.29.arm.vendor",
+        "libRSCpuRef.vndk.29.arm.vendor",
+        "libRSDriver.vndk.29.arm.vendor",
+        "libRS_internal.vndk.29.arm.vendor",
+        "libbacktrace.vndk.29.arm.vendor",
+        "libbase.vndk.29.arm.vendor",
+        "libbcinfo.vndk.29.arm.vendor",
+        "libbinderthreadstate.vndk.29.arm.vendor",
+        "libblas.vndk.29.arm.vendor",
+        "libc++.vndk.29.arm.vendor",
+        "libcompiler_rt.vndk.29.arm.vendor",
+        "libcutils.vndk.29.arm.vendor",
+        "libhardware.vndk.29.arm.vendor",
+        "libhidlbase.vndk.29.arm.vendor",
+        "libhidlmemory.vndk.29.arm.vendor",
+        "libhidltransport.vndk.29.arm.vendor",
+        "libhwbinder.vndk.29.arm.vendor",
+        "libhwbinder_noltopgo.vndk.29.arm.vendor",
+        "libion.vndk.29.arm.vendor",
+        "libjsoncpp.vndk.29.arm.vendor",
+        "liblzma.vndk.29.arm.vendor",
+        "libprocessgroup.vndk.29.arm.vendor",
+        "libunwindstack.vndk.29.arm.vendor",
+        "libutils.vndk.29.arm.vendor",
+        "libutilscallstack.vndk.29.arm.vendor",
+        "libz.vndk.29.arm.vendor",
+        "ld.config.29.txt",
+        "llndk.libraries.29.txt",
+        "vndksp.libraries.29.txt",
+    ],
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.cameraservice.common@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.common@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.cameraservice.device@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.device@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.cameraservice.service@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.service@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.displayservice@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.displayservice@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.schedulerservice@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.schedulerservice@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.sensorservice@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.sensorservice@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.stats@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.stats@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.vr.composer@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.vr.composer@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.atrace@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.atrace@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.common@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.common@4.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@4.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.common@5.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@5.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.effect@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.effect@4.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@4.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.effect@5.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@5.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio@4.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@4.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio@5.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@5.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.authsecret@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.authsecret@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.automotive.audiocontrol@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.audiocontrol@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.automotive.evs@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.evs@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.automotive.vehicle@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.vehicle@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.biometrics.face@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.face@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.biometrics.fingerprint@2.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.fingerprint@2.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.bluetooth.a2dp@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.a2dp@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.bluetooth.audio@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.audio@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.bluetooth@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.boot@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.boot@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.broadcastradio@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.broadcastradio@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.broadcastradio@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.common@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.common@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@3.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@3.3",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@3.4",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.4.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@3.5",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.5.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.metadata@3.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.metadata@3.3",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.metadata@3.4",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.4.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.provider@2.4",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.4.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.provider@2.5",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.5.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.cas.native@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas.native@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.cas@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.cas@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.configstore-utils",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore-utils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.configstore@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.configstore@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.confirmationui-support-lib",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui-support-lib.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.confirmationui@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.contexthub@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.contexthub@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.drm@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.drm@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.drm@1.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.dumpstate@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.dumpstate@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.fastboot@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.fastboot@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gatekeeper@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gatekeeper@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss.measurement_corrections@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.measurement_corrections@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss.visibility_control@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.visibility_control@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.allocator@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.allocator@3.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@3.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.bufferqueue@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.bufferqueue@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.composer@2.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.composer@2.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.composer@2.3",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.health.storage@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health.storage@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.health@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.health@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.input.classifier@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.classifier@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.input.common@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.common@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.ir@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.ir@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.keymaster@3.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@3.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.keymaster@4.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@4.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.light@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.light@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.media.bufferpool@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.media.bufferpool@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.media.c2@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.c2@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.media.omx@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.omx@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.media@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.memtrack@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.memtrack@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.neuralnetworks@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.neuralnetworks@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.neuralnetworks@1.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.nfc@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.nfc@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.nfc@1.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.oemlock@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.oemlock@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.power.stats@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power.stats@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.power@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.power@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.power@1.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.power@1.3",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio.config@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio.config@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio.config@1.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio.deprecated@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.deprecated@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio@1.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio@1.3",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio@1.4",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.4.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.secure_element@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.secure_element@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.sensors@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.sensors@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.soundtrigger@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.soundtrigger@2.0-core",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0-core.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.soundtrigger@2.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.soundtrigger@2.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.tetheroffload.config@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.config@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.tetheroffload.control@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.control@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.thermal@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.thermal@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.thermal@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.tv.cec@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.tv.cec@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.tv.input@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.input@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.usb.gadget@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb.gadget@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.usb@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.usb@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.usb@1.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.vibrator@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.vibrator@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.vibrator@1.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.vibrator@1.3",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.vr@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vr@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.weaver@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.weaver@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi.hostapd@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi.hostapd@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi.offload@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.offload@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi.supplicant@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi.supplicant@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi.supplicant@1.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi@1.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi@1.3",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.allocator@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.allocator@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.memory.block@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.memory.block@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.token@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.token@1.0-utils",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0-utils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.system.net.netd@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.system.net.netd@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.system.suspend@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.system.suspend@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.system.wifi.keystore@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.system.wifi.keystore@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libadf",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libadf.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libaudioroute",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libaudioroute.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libaudioutils",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libbinder",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcamera_metadata",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcamera_metadata.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcap",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libcap.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcap.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libclang_rt.scudo-arm-android",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo-arm-android.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libclang_rt.scudo_minimal-arm-android",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo_minimal-arm-android.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libclang_rt.ubsan_minimal-arm-android",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libclang_rt.ubsan_standalone-arm-android",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.ubsan_standalone-arm-android.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcn-cbor",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcn-cbor.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcodec2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcodec2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcrypto",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libcrypto.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcrypto_utils",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcrypto_utils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcurl",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libcurl.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libdiskconfig",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libdiskconfig.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libdumpstateutil",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libdumpstateutil.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libevent",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libevent.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libevent.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libexif",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libexif.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexif.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libexpat",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libexpat.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libfmq",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libfmq.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libgatekeeper",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libgatekeeper.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libgui",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: false,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libgui.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhardware_legacy",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libhardware_legacy.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhidlallocatorutils",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhidlallocatorutils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhidlcache",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhidlcache.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libjpeg",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libjpeg.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libkeymaster_messages",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libkeymaster_messages.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libkeymaster_portable",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libkeymaster_portable.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libldacBT_abr",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libldacBT_abr.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libldacBT_enc",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libldacBT_enc.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "liblz4",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-liblz4.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libmedia_helper",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libmedia_helper.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libmedia_omx",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libmedia_omx.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libmemtrack",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmemtrack.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libminijail",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libminijail.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libmkbootimg_abi_check",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmkbootimg_abi_check.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libnetutils",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libnetutils.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libnl",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libnl.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnl.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libpcre2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libpcre2.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libpiex",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libpiex.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libpng",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpng.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libpower",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libpower.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpower.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libprocinfo",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprocinfo.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libprotobuf-cpp-full",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libprotobuf-cpp-full.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libprotobuf-cpp-lite",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libprotobuf-cpp-lite.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libpuresoftkeymasterdevice",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libpuresoftkeymasterdevice.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libradio_metadata",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libradio_metadata.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libselinux",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libselinux.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libsoftkeymasterdevice",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libsoftkeymasterdevice.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libspeexresampler",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libspeexresampler.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libsqlite",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libsqlite.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libssl",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libssl.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libssl.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libstagefright_bufferpool@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferpool@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libstagefright_bufferqueue_helper",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libstagefright_foundation",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libstagefright_foundation.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libstagefright_omx",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libstagefright_omx.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libstagefright_omx_utils",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libstagefright_omx_utils.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libstagefright_xmlparser",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_xmlparser.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libsysutils",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libtinyalsa",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libtinyalsa.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libtinyxml2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libtinyxml2.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libui",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libui.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libui.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libusbhost",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libusbhost.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libwifi-system-iface",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libwifi-system-iface.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libxml2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libxml2.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libyuv",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libyuv.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libziparchive",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libziparchive.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.common@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.common@1.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.common@1.2",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.mapper@2.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.mapper@2.1",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.mapper@3.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@3.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.renderscript@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.renderscript@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.memory.token@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory.token@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.memory@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.memory@1.0-impl",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    relative_install_path: "hw",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.safe_union@1.0",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.safe_union@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libRSCpuRef",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libRSDriver",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libRSDriver.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libRS_internal",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libRS_internal.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libbacktrace",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: false,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libbase",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libbase.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libbcinfo",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libbinderthreadstate",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: false,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libbinderthreadstate.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libblas",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: false,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libblas.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libc++",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libc++.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcompiler_rt",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: false,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libcompiler_rt.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcutils",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libcutils.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhardware",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libhardware.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhidlbase",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libhidlbase.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhidlmemory",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhidlmemory.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhidltransport",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libhidltransport.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhwbinder",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libhwbinder.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhwbinder_noltopgo",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libhwbinder_noltopgo.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libion",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libion.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libjsoncpp",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libjsoncpp.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "liblzma",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/liblzma.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libprocessgroup",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libprocessgroup.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libunwindstack",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libutils",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libutils.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libutilscallstack",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libutilscallstack.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libz",
+    version: "29",
+    target_arch: "arm",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libz.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libz.so"],
+        },
+    },
+}
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.common@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.common@2.0.so
new file mode 100755
index 0000000..ed2d4b5
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.common@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.device@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.device@2.0.so
new file mode 100755
index 0000000..3e55be3
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.device@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.service@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.service@2.0.so
new file mode 100755
index 0000000..4540e7f
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.service@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.displayservice@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.displayservice@1.0.so
new file mode 100755
index 0000000..c1dbbc2
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.displayservice@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.schedulerservice@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.schedulerservice@1.0.so
new file mode 100755
index 0000000..e14741b
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.schedulerservice@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.sensorservice@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.sensorservice@1.0.so
new file mode 100755
index 0000000..8710e53
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.sensorservice@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.stats@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.stats@1.0.so
new file mode 100755
index 0000000..ebf90b6
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.stats@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.vr.composer@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.vr.composer@1.0.so
new file mode 100755
index 0000000..df15949
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.vr.composer@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.atrace@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.atrace@1.0.so
new file mode 100755
index 0000000..ce055c3
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.atrace@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@2.0.so
new file mode 100755
index 0000000..202f7fb
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@4.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@4.0.so
new file mode 100755
index 0000000..6ef2115
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@4.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@5.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@5.0.so
new file mode 100755
index 0000000..dc830b8
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@5.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@2.0.so
new file mode 100755
index 0000000..f14d8ce
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@4.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@4.0.so
new file mode 100755
index 0000000..9b358f5
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@4.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@5.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@5.0.so
new file mode 100755
index 0000000..990d743
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@5.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@2.0.so
new file mode 100755
index 0000000..1da8eb5
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@4.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@4.0.so
new file mode 100755
index 0000000..6339028
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@4.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@5.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@5.0.so
new file mode 100755
index 0000000..1b2c7d3
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@5.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.authsecret@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.authsecret@1.0.so
new file mode 100755
index 0000000..8fb853b
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.authsecret@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.audiocontrol@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.audiocontrol@1.0.so
new file mode 100755
index 0000000..f87b7b7
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.audiocontrol@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.evs@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.evs@1.0.so
new file mode 100755
index 0000000..c347604
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.evs@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.vehicle@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.vehicle@2.0.so
new file mode 100755
index 0000000..fdd3016
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.vehicle@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.face@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.face@1.0.so
new file mode 100755
index 0000000..34d6732
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.face@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.fingerprint@2.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.fingerprint@2.1.so
new file mode 100755
index 0000000..0a490f7
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.fingerprint@2.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.a2dp@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.a2dp@1.0.so
new file mode 100755
index 0000000..492278a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.a2dp@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.audio@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.audio@2.0.so
new file mode 100755
index 0000000..03bb284
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.audio@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth@1.0.so
new file mode 100755
index 0000000..1fb3ac1
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.boot@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.boot@1.0.so
new file mode 100755
index 0000000..6c4a5a1
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.boot@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.0.so
new file mode 100755
index 0000000..3415987
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.1.so
new file mode 100755
index 0000000..ffac19c
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@2.0.so
new file mode 100755
index 0000000..01fefb5
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.common@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.common@1.0.so
new file mode 100755
index 0000000..2b045f1
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.common@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@1.0.so
new file mode 100755
index 0000000..9901441
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.2.so
new file mode 100755
index 0000000..9a48a19
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.3.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.3.so
new file mode 100755
index 0000000..5f85dcd
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.3.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.4.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.4.so
new file mode 100755
index 0000000..ae207f3
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.4.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.5.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.5.so
new file mode 100755
index 0000000..6f1ac4a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.5.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.2.so
new file mode 100755
index 0000000..da27cbe
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.3.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.3.so
new file mode 100755
index 0000000..a979c63
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.3.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.4.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.4.so
new file mode 100755
index 0000000..2d7aca4
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.4.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.4.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.4.so
new file mode 100755
index 0000000..519929b
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.4.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.5.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.5.so
new file mode 100755
index 0000000..45f29f4
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.5.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas.native@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas.native@1.0.so
new file mode 100755
index 0000000..c51b376
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas.native@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.0.so
new file mode 100755
index 0000000..259e263
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.1.so
new file mode 100755
index 0000000..6c49836
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore-utils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore-utils.so
new file mode 100755
index 0000000..78c3a5a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore-utils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.0.so
new file mode 100755
index 0000000..cb7aeab
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.1.so
new file mode 100755
index 0000000..a306dfc
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui-support-lib.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui-support-lib.so
new file mode 100755
index 0000000..c07cad4
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui-support-lib.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui@1.0.so
new file mode 100755
index 0000000..a0b3e9a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.contexthub@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.contexthub@1.0.so
new file mode 100755
index 0000000..43a83fc
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.contexthub@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.0.so
new file mode 100755
index 0000000..d8c4e3c
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.1.so
new file mode 100755
index 0000000..bec42cd
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.2.so
new file mode 100755
index 0000000..8e27e90
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.dumpstate@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.dumpstate@1.0.so
new file mode 100755
index 0000000..af721f3
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.dumpstate@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.fastboot@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.fastboot@1.0.so
new file mode 100755
index 0000000..4d617af
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.fastboot@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gatekeeper@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gatekeeper@1.0.so
new file mode 100755
index 0000000..9c3a9ca
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gatekeeper@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.measurement_corrections@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.measurement_corrections@1.0.so
new file mode 100755
index 0000000..c29f78f
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.measurement_corrections@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.visibility_control@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.visibility_control@1.0.so
new file mode 100755
index 0000000..ee74387
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.visibility_control@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.0.so
new file mode 100755
index 0000000..c981a4f
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.1.so
new file mode 100755
index 0000000..d4c3c48
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@2.0.so
new file mode 100755
index 0000000..703153a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@2.0.so
new file mode 100755
index 0000000..ea0f992
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@3.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@3.0.so
new file mode 100755
index 0000000..53db257
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@3.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@1.0.so
new file mode 100755
index 0000000..1f58c2a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@2.0.so
new file mode 100755
index 0000000..780b8b6
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.1.so
new file mode 100755
index 0000000..ca5ced9
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.2.so
new file mode 100755
index 0000000..4639068
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.3.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.3.so
new file mode 100755
index 0000000..067def0
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.3.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health.storage@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health.storage@1.0.so
new file mode 100755
index 0000000..c0ef49a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health.storage@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@1.0.so
new file mode 100755
index 0000000..3c11b90
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@2.0.so
new file mode 100755
index 0000000..96662bc
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.classifier@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.classifier@1.0.so
new file mode 100755
index 0000000..3242ca2
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.classifier@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.common@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.common@1.0.so
new file mode 100755
index 0000000..7e432ba
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.common@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.ir@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.ir@1.0.so
new file mode 100755
index 0000000..c8f92c1
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.ir@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@3.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@3.0.so
new file mode 100755
index 0000000..97a3401
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@3.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@4.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@4.0.so
new file mode 100755
index 0000000..1505881
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@4.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.light@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.light@2.0.so
new file mode 100755
index 0000000..0daf89f
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.light@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@1.0.so
new file mode 100755
index 0000000..9e6214f
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@2.0.so
new file mode 100755
index 0000000..d01feb1
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.c2@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.c2@1.0.so
new file mode 100755
index 0000000..d0cd338
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.c2@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.omx@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.omx@1.0.so
new file mode 100755
index 0000000..01ff97a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.omx@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media@1.0.so
new file mode 100755
index 0000000..1f107f5
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.memtrack@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.memtrack@1.0.so
new file mode 100755
index 0000000..f44b0a9
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.memtrack@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.0.so
new file mode 100755
index 0000000..1576ba7
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.1.so
new file mode 100755
index 0000000..46ab465
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.2.so
new file mode 100755
index 0000000..dfd67c0
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.0.so
new file mode 100755
index 0000000..eec896a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.1.so
new file mode 100755
index 0000000..54cb492
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.2.so
new file mode 100755
index 0000000..f48b969
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.oemlock@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.oemlock@1.0.so
new file mode 100755
index 0000000..24f577c
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.oemlock@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power.stats@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power.stats@1.0.so
new file mode 100755
index 0000000..c5489d2
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power.stats@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.0.so
new file mode 100755
index 0000000..8c05687
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.1.so
new file mode 100755
index 0000000..97727b7
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.2.so
new file mode 100755
index 0000000..3ae75df
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.3.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.3.so
new file mode 100755
index 0000000..deb4659
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.3.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.0.so
new file mode 100755
index 0000000..ca9a2be
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.1.so
new file mode 100755
index 0000000..333a227
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.2.so
new file mode 100755
index 0000000..ade2b9a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.deprecated@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.deprecated@1.0.so
new file mode 100755
index 0000000..2e8bfca
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.deprecated@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.0.so
new file mode 100755
index 0000000..b343b24
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.1.so
new file mode 100755
index 0000000..b0c6fca
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.2.so
new file mode 100755
index 0000000..3c90ddd
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.3.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.3.so
new file mode 100755
index 0000000..344dcdf
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.3.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.4.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.4.so
new file mode 100755
index 0000000..6d71119
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.4.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.0.so
new file mode 100755
index 0000000..5185af7
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.1.so
new file mode 100755
index 0000000..0f04a9c
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@1.0.so
new file mode 100755
index 0000000..f7f1046
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@2.0.so
new file mode 100755
index 0000000..2699403
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0-core.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0-core.so
new file mode 100755
index 0000000..26689d7
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0-core.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0.so
new file mode 100755
index 0000000..8559c1b
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.1.so
new file mode 100755
index 0000000..6246d1d
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.2.so
new file mode 100755
index 0000000..b3b35b8
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.config@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.config@1.0.so
new file mode 100755
index 0000000..3678b63
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.config@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.control@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.control@1.0.so
new file mode 100755
index 0000000..81e90cc
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.control@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.0.so
new file mode 100755
index 0000000..66522bc
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.1.so
new file mode 100755
index 0000000..a0a5185
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@2.0.so
new file mode 100755
index 0000000..a0a4788
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@1.0.so
new file mode 100755
index 0000000..2647c1a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@2.0.so
new file mode 100755
index 0000000..8ce329e
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.input@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.input@1.0.so
new file mode 100755
index 0000000..22d349a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.input@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb.gadget@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb.gadget@1.0.so
new file mode 100755
index 0000000..9cdf0dd
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb.gadget@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.0.so
new file mode 100755
index 0000000..4b67720
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.1.so
new file mode 100755
index 0000000..79c19d5
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.2.so
new file mode 100755
index 0000000..455eb25
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.0.so
new file mode 100755
index 0000000..9247297
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.1.so
new file mode 100755
index 0000000..3e3de59
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.2.so
new file mode 100755
index 0000000..3280763
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.3.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.3.so
new file mode 100755
index 0000000..633822e
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.3.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vr@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vr@1.0.so
new file mode 100755
index 0000000..270eb33
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vr@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.weaver@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.weaver@1.0.so
new file mode 100755
index 0000000..a403a09
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.weaver@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.0.so
new file mode 100755
index 0000000..b33a389
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.1.so
new file mode 100755
index 0000000..70822e2
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.offload@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.offload@1.0.so
new file mode 100755
index 0000000..65b0d51
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.offload@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.0.so
new file mode 100755
index 0000000..b2a06e5
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.1.so
new file mode 100755
index 0000000..82e8cb4
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.2.so
new file mode 100755
index 0000000..d0aa2af
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.0.so
new file mode 100755
index 0000000..e544873
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.1.so
new file mode 100755
index 0000000..d2e1e0e
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.2.so
new file mode 100755
index 0000000..fe7f713
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.3.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.3.so
new file mode 100755
index 0000000..3e6e299
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.3.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.allocator@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.allocator@1.0.so
new file mode 100755
index 0000000..33667a6
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.allocator@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.memory.block@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.memory.block@1.0.so
new file mode 100755
index 0000000..7064df5
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.memory.block@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0-utils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0-utils.so
new file mode 100755
index 0000000..c271518
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0-utils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0.so
new file mode 100755
index 0000000..0f93e19
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.0.so
new file mode 100755
index 0000000..532c6c5
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.1.so
new file mode 100755
index 0000000..b71f248
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.system.suspend@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.system.suspend@1.0.so
new file mode 100755
index 0000000..e791885
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.system.suspend@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.system.wifi.keystore@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.system.wifi.keystore@1.0.so
new file mode 100755
index 0000000..7d7a63c
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/android.system.wifi.keystore@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libadf.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libadf.so
new file mode 100755
index 0000000..a0dbf13
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libadf.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so
new file mode 100755
index 0000000..75abce2
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so
new file mode 100755
index 0000000..4f1bd4f
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so
new file mode 100755
index 0000000..af6fc7e
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcamera_metadata.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcamera_metadata.so
new file mode 100755
index 0000000..be9797a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcamera_metadata.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcap.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcap.so
new file mode 100755
index 0000000..ac48a3f
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcap.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo-arm-android.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo-arm-android.so
new file mode 100644
index 0000000..bcb8f81
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo-arm-android.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo_minimal-arm-android.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo_minimal-arm-android.so
new file mode 100644
index 0000000..3b61d52
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo_minimal-arm-android.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.ubsan_standalone-arm-android.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.ubsan_standalone-arm-android.so
new file mode 100644
index 0000000..3f995d4
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.ubsan_standalone-arm-android.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcn-cbor.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcn-cbor.so
new file mode 100755
index 0000000..72f4504
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcn-cbor.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcodec2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcodec2.so
new file mode 100755
index 0000000..439090e
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcodec2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so
new file mode 100755
index 0000000..695d486
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcrypto_utils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcrypto_utils.so
new file mode 100755
index 0000000..6936a66
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcrypto_utils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so
new file mode 100755
index 0000000..15f68f9
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libdiskconfig.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libdiskconfig.so
new file mode 100755
index 0000000..a0f135c
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libdiskconfig.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libdumpstateutil.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libdumpstateutil.so
new file mode 100755
index 0000000..d722730
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libdumpstateutil.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libevent.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libevent.so
new file mode 100755
index 0000000..faae650
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libevent.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libexif.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libexif.so
new file mode 100755
index 0000000..79e94c7
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libexif.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so
new file mode 100755
index 0000000..c8b350b
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libfmq.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libfmq.so
new file mode 100755
index 0000000..f7b8019
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libfmq.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgatekeeper.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgatekeeper.so
new file mode 100755
index 0000000..eb91030
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgatekeeper.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so
new file mode 100755
index 0000000..c5fbb8f
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so
new file mode 100755
index 0000000..4e9e5d9
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libhidlallocatorutils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libhidlallocatorutils.so
new file mode 100755
index 0000000..603b946
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libhidlallocatorutils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libhidlcache.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libhidlcache.so
new file mode 100755
index 0000000..eb29e58
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libhidlcache.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so
new file mode 100755
index 0000000..cea6744
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so
new file mode 100755
index 0000000..517623c
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so
new file mode 100755
index 0000000..3c1a2d9
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so
new file mode 100755
index 0000000..5753b85
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so
new file mode 100755
index 0000000..2ea2d7b
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so
new file mode 100755
index 0000000..7378500
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so
new file mode 100755
index 0000000..ab4b3ab
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so
new file mode 100755
index 0000000..0f1a517
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmemtrack.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmemtrack.so
new file mode 100755
index 0000000..9e8c29e
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmemtrack.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so
new file mode 100755
index 0000000..da07a32
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmkbootimg_abi_check.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmkbootimg_abi_check.so
new file mode 100755
index 0000000..a2e01eb
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmkbootimg_abi_check.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so
new file mode 100755
index 0000000..4a7bc96
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libnl.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libnl.so
new file mode 100755
index 0000000..bf6bbcf
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libnl.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so
new file mode 100755
index 0000000..99b12c7
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so
new file mode 100755
index 0000000..dbeabd0
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpng.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpng.so
new file mode 100755
index 0000000..12fb941
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpng.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so
new file mode 100755
index 0000000..bf57b6c
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libprocinfo.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libprocinfo.so
new file mode 100755
index 0000000..21abd16
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libprocinfo.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so
new file mode 100755
index 0000000..f9496d0
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so
new file mode 100755
index 0000000..c183adc
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so
new file mode 100755
index 0000000..c9097c0
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libradio_metadata.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libradio_metadata.so
new file mode 100755
index 0000000..47f11be
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libradio_metadata.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libselinux.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libselinux.so
new file mode 100755
index 0000000..fcf2dff
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libselinux.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so
new file mode 100755
index 0000000..25739df
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so
new file mode 100755
index 0000000..9e21cb2
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so
new file mode 100755
index 0000000..20f504d
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libssl.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libssl.so
new file mode 100755
index 0000000..3ff4e22
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libssl.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferpool@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferpool@2.0.so
new file mode 100755
index 0000000..99cad7f
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferpool@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so
new file mode 100755
index 0000000..c9d1e7c
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so
new file mode 100755
index 0000000..c4d3c7f
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
new file mode 100755
index 0000000..7a10d23
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so
new file mode 100755
index 0000000..0ca438f
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_xmlparser.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_xmlparser.so
new file mode 100755
index 0000000..c924f1c
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_xmlparser.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so
new file mode 100755
index 0000000..70cff5f
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so
new file mode 100755
index 0000000..949201a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so
new file mode 100755
index 0000000..f40ac0b
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libui.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
new file mode 100755
index 0000000..b8521df
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libusbhost.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libusbhost.so
new file mode 100755
index 0000000..720689d
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libusbhost.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libwifi-system-iface.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libwifi-system-iface.so
new file mode 100755
index 0000000..4392f35
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libwifi-system-iface.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so
new file mode 100755
index 0000000..0e2cdf7
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libyuv.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libyuv.so
new file mode 100755
index 0000000..32c63d9
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libyuv.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libziparchive.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libziparchive.so
new file mode 100755
index 0000000..b52a218
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libziparchive.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.0.so
new file mode 100755
index 0000000..9c8bd39
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.1.so
new file mode 100755
index 0000000..31d6e59
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.2.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.2.so
new file mode 100755
index 0000000..909a2f0
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.2.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.0.so
new file mode 100755
index 0000000..aa5f818
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.1.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.1.so
new file mode 100755
index 0000000..52c7e08
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.1.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@3.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@3.0.so
new file mode 100755
index 0000000..77bbf72
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@3.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.renderscript@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.renderscript@1.0.so
new file mode 100755
index 0000000..3c536cb
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.renderscript@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory.token@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory.token@1.0.so
new file mode 100755
index 0000000..1d7e574
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory.token@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so
new file mode 100755
index 0000000..59938ff
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0.so
new file mode 100755
index 0000000..cf3b24b
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.safe_union@1.0.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.safe_union@1.0.so
new file mode 100755
index 0000000..f45b1fe
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.safe_union@1.0.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so
new file mode 100755
index 0000000..b6c5c5d
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libRSDriver.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libRSDriver.so
new file mode 100755
index 0000000..327bd43
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libRSDriver.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libRS_internal.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libRS_internal.so
new file mode 100755
index 0000000..4ee976a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libRS_internal.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so
new file mode 100755
index 0000000..c050089
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbase.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbase.so
new file mode 100755
index 0000000..b33df3e
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbase.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so
new file mode 100755
index 0000000..e03b89c
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbinderthreadstate.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbinderthreadstate.so
new file mode 100755
index 0000000..3ea62f4
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbinderthreadstate.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so
new file mode 100755
index 0000000..b631b28
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so
new file mode 100755
index 0000000..d9a145f
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so
new file mode 100755
index 0000000..1ebc5e0
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so
new file mode 100755
index 0000000..19b592b
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so
new file mode 100755
index 0000000..d9e7e50
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
new file mode 100755
index 0000000..402f2ad
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlmemory.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlmemory.so
new file mode 100755
index 0000000..ecf2d90
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlmemory.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so
new file mode 100755
index 0000000..5029aaf
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so
new file mode 100755
index 0000000..b022b35
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so
new file mode 100755
index 0000000..ef60d87
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libion.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libion.so
new file mode 100755
index 0000000..8d68af6
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libion.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libjsoncpp.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libjsoncpp.so
new file mode 100755
index 0000000..484763e
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libjsoncpp.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/liblzma.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/liblzma.so
new file mode 100755
index 0000000..5c1c562
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/liblzma.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libprocessgroup.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libprocessgroup.so
new file mode 100755
index 0000000..35f22b4
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libprocessgroup.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so
new file mode 100755
index 0000000..09e4904
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so
new file mode 100755
index 0000000..812ba2a
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so
new file mode 100755
index 0000000..d627442
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libz.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libz.so
new file mode 100755
index 0000000..f862beb
--- /dev/null
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libz.so
Binary files differ
diff --git a/arm/binder32/Android.bp b/arm/binder32/Android.bp
new file mode 100644
index 0000000..2529085
--- /dev/null
+++ b/arm/binder32/Android.bp
@@ -0,0 +1,4394 @@
+// THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
+// DO NOT EDIT
+
+phony {
+    name: "vndk_v29_arm_binder32",
+    required: [
+        "android.frameworks.cameraservice.common@2.0.vndk.29.arm.binder32.vendor",
+        "android.frameworks.cameraservice.device@2.0.vndk.29.arm.binder32.vendor",
+        "android.frameworks.cameraservice.service@2.0.vndk.29.arm.binder32.vendor",
+        "android.frameworks.displayservice@1.0.vndk.29.arm.binder32.vendor",
+        "android.frameworks.schedulerservice@1.0.vndk.29.arm.binder32.vendor",
+        "android.frameworks.sensorservice@1.0.vndk.29.arm.binder32.vendor",
+        "android.frameworks.stats@1.0.vndk.29.arm.binder32.vendor",
+        "android.frameworks.vr.composer@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.atrace@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.audio.common@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.audio.common@4.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.audio.common@5.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.audio.effect@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.audio.effect@4.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.audio.effect@5.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.audio@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.audio@4.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.audio@5.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.authsecret@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.automotive.audiocontrol@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.automotive.evs@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.automotive.vehicle@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.biometrics.face@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.biometrics.fingerprint@2.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.bluetooth.a2dp@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.bluetooth.audio@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.bluetooth@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.boot@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.broadcastradio@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.broadcastradio@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.broadcastradio@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.camera.common@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.camera.device@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.camera.device@3.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.camera.device@3.3.vndk.29.arm.binder32.vendor",
+        "android.hardware.camera.device@3.4.vndk.29.arm.binder32.vendor",
+        "android.hardware.camera.device@3.5.vndk.29.arm.binder32.vendor",
+        "android.hardware.camera.metadata@3.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.camera.metadata@3.3.vndk.29.arm.binder32.vendor",
+        "android.hardware.camera.metadata@3.4.vndk.29.arm.binder32.vendor",
+        "android.hardware.camera.provider@2.4.vndk.29.arm.binder32.vendor",
+        "android.hardware.camera.provider@2.5.vndk.29.arm.binder32.vendor",
+        "android.hardware.cas.native@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.cas@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.cas@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.configstore-utils.vndk.29.arm.binder32.vendor",
+        "android.hardware.configstore@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.configstore@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.confirmationui-support-lib.vndk.29.arm.binder32.vendor",
+        "android.hardware.confirmationui@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.contexthub@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.drm@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.drm@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.drm@1.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.dumpstate@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.fastboot@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.gatekeeper@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.gnss.measurement_corrections@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.gnss.visibility_control@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.gnss@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.gnss@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.gnss@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.graphics.allocator@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.graphics.allocator@3.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.graphics.bufferqueue@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.graphics.bufferqueue@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.graphics.composer@2.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.graphics.composer@2.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.graphics.composer@2.3.vndk.29.arm.binder32.vendor",
+        "android.hardware.health.storage@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.health@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.health@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.input.classifier@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.input.common@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.ir@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.keymaster@3.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.keymaster@4.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.light@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.media.bufferpool@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.media.bufferpool@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.media.c2@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.media.omx@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.media@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.memtrack@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.neuralnetworks@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.neuralnetworks@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.neuralnetworks@1.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.nfc@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.nfc@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.nfc@1.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.oemlock@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.power.stats@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.power@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.power@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.power@1.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.power@1.3.vndk.29.arm.binder32.vendor",
+        "android.hardware.radio.config@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.radio.config@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.radio.config@1.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.radio.deprecated@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.radio@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.radio@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.radio@1.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.radio@1.3.vndk.29.arm.binder32.vendor",
+        "android.hardware.radio@1.4.vndk.29.arm.binder32.vendor",
+        "android.hardware.secure_element@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.secure_element@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.sensors@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.sensors@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.soundtrigger@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.soundtrigger@2.0-core.vndk.29.arm.binder32.vendor",
+        "android.hardware.soundtrigger@2.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.soundtrigger@2.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.tetheroffload.config@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.tetheroffload.control@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.thermal@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.thermal@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.thermal@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.tv.cec@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.tv.cec@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.tv.input@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.usb.gadget@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.usb@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.usb@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.usb@1.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.vibrator@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.vibrator@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.vibrator@1.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.vibrator@1.3.vndk.29.arm.binder32.vendor",
+        "android.hardware.vr@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.weaver@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.wifi.hostapd@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.wifi.hostapd@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.wifi.offload@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.wifi.supplicant@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.wifi.supplicant@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.wifi.supplicant@1.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.wifi@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.wifi@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.wifi@1.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.wifi@1.3.vndk.29.arm.binder32.vendor",
+        "android.hidl.allocator@1.0.vndk.29.arm.binder32.vendor",
+        "android.hidl.memory.block@1.0.vndk.29.arm.binder32.vendor",
+        "android.hidl.token@1.0.vndk.29.arm.binder32.vendor",
+        "android.hidl.token@1.0-utils.vndk.29.arm.binder32.vendor",
+        "android.system.net.netd@1.0.vndk.29.arm.binder32.vendor",
+        "android.system.net.netd@1.1.vndk.29.arm.binder32.vendor",
+        "android.system.suspend@1.0.vndk.29.arm.binder32.vendor",
+        "android.system.wifi.keystore@1.0.vndk.29.arm.binder32.vendor",
+        "libadf.vndk.29.arm.binder32.vendor",
+        "libaudioroute.vndk.29.arm.binder32.vendor",
+        "libaudioutils.vndk.29.arm.binder32.vendor",
+        "libbinder.vndk.29.arm.binder32.vendor",
+        "libcamera_metadata.vndk.29.arm.binder32.vendor",
+        "libcap.vndk.29.arm.binder32.vendor",
+        "libclang_rt.scudo-arm-android.vndk.29.arm.binder32.vendor",
+        "libclang_rt.scudo_minimal-arm-android.vndk.29.arm.binder32.vendor",
+        "libclang_rt.ubsan_minimal-arm-android.vndk.29.arm.binder32.vendor",
+        "libclang_rt.ubsan_standalone-arm-android.vndk.29.arm.binder32.vendor",
+        "libcn-cbor.vndk.29.arm.binder32.vendor",
+        "libcodec2.vndk.29.arm.binder32.vendor",
+        "libcrypto.vndk.29.arm.binder32.vendor",
+        "libcrypto_utils.vndk.29.arm.binder32.vendor",
+        "libcurl.vndk.29.arm.binder32.vendor",
+        "libdiskconfig.vndk.29.arm.binder32.vendor",
+        "libdumpstateutil.vndk.29.arm.binder32.vendor",
+        "libevent.vndk.29.arm.binder32.vendor",
+        "libexif.vndk.29.arm.binder32.vendor",
+        "libexpat.vndk.29.arm.binder32.vendor",
+        "libfmq.vndk.29.arm.binder32.vendor",
+        "libgatekeeper.vndk.29.arm.binder32.vendor",
+        "libgui.vndk.29.arm.binder32.vendor",
+        "libhardware_legacy.vndk.29.arm.binder32.vendor",
+        "libhidlallocatorutils.vndk.29.arm.binder32.vendor",
+        "libhidlcache.vndk.29.arm.binder32.vendor",
+        "libjpeg.vndk.29.arm.binder32.vendor",
+        "libkeymaster_messages.vndk.29.arm.binder32.vendor",
+        "libkeymaster_portable.vndk.29.arm.binder32.vendor",
+        "libldacBT_abr.vndk.29.arm.binder32.vendor",
+        "libldacBT_enc.vndk.29.arm.binder32.vendor",
+        "liblz4.vndk.29.arm.binder32.vendor",
+        "libmedia_helper.vndk.29.arm.binder32.vendor",
+        "libmedia_omx.vndk.29.arm.binder32.vendor",
+        "libmemtrack.vndk.29.arm.binder32.vendor",
+        "libminijail.vndk.29.arm.binder32.vendor",
+        "libmkbootimg_abi_check.vndk.29.arm.binder32.vendor",
+        "libnetutils.vndk.29.arm.binder32.vendor",
+        "libnl.vndk.29.arm.binder32.vendor",
+        "libpcre2.vndk.29.arm.binder32.vendor",
+        "libpiex.vndk.29.arm.binder32.vendor",
+        "libpng.vndk.29.arm.binder32.vendor",
+        "libpower.vndk.29.arm.binder32.vendor",
+        "libprocinfo.vndk.29.arm.binder32.vendor",
+        "libprotobuf-cpp-full.vndk.29.arm.binder32.vendor",
+        "libprotobuf-cpp-lite.vndk.29.arm.binder32.vendor",
+        "libpuresoftkeymasterdevice.vndk.29.arm.binder32.vendor",
+        "libradio_metadata.vndk.29.arm.binder32.vendor",
+        "libselinux.vndk.29.arm.binder32.vendor",
+        "libsoftkeymasterdevice.vndk.29.arm.binder32.vendor",
+        "libspeexresampler.vndk.29.arm.binder32.vendor",
+        "libsqlite.vndk.29.arm.binder32.vendor",
+        "libssl.vndk.29.arm.binder32.vendor",
+        "libstagefright_bufferpool@2.0.vndk.29.arm.binder32.vendor",
+        "libstagefright_bufferqueue_helper.vndk.29.arm.binder32.vendor",
+        "libstagefright_foundation.vndk.29.arm.binder32.vendor",
+        "libstagefright_omx.vndk.29.arm.binder32.vendor",
+        "libstagefright_omx_utils.vndk.29.arm.binder32.vendor",
+        "libstagefright_xmlparser.vndk.29.arm.binder32.vendor",
+        "libsysutils.vndk.29.arm.binder32.vendor",
+        "libtinyalsa.vndk.29.arm.binder32.vendor",
+        "libtinyxml2.vndk.29.arm.binder32.vendor",
+        "libui.vndk.29.arm.binder32.vendor",
+        "libusbhost.vndk.29.arm.binder32.vendor",
+        "libwifi-system-iface.vndk.29.arm.binder32.vendor",
+        "libxml2.vndk.29.arm.binder32.vendor",
+        "libyuv.vndk.29.arm.binder32.vendor",
+        "libziparchive.vndk.29.arm.binder32.vendor",
+        "android.hardware.graphics.common@1.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.graphics.common@1.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.graphics.common@1.2.vndk.29.arm.binder32.vendor",
+        "android.hardware.graphics.mapper@2.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.graphics.mapper@2.1.vndk.29.arm.binder32.vendor",
+        "android.hardware.graphics.mapper@3.0.vndk.29.arm.binder32.vendor",
+        "android.hardware.renderscript@1.0.vndk.29.arm.binder32.vendor",
+        "android.hidl.memory.token@1.0.vndk.29.arm.binder32.vendor",
+        "android.hidl.memory@1.0.vndk.29.arm.binder32.vendor",
+        "android.hidl.memory@1.0-impl.vndk.29.arm.binder32.vendor",
+        "android.hidl.safe_union@1.0.vndk.29.arm.binder32.vendor",
+        "libRSCpuRef.vndk.29.arm.binder32.vendor",
+        "libRSDriver.vndk.29.arm.binder32.vendor",
+        "libRS_internal.vndk.29.arm.binder32.vendor",
+        "libbacktrace.vndk.29.arm.binder32.vendor",
+        "libbase.vndk.29.arm.binder32.vendor",
+        "libbcinfo.vndk.29.arm.binder32.vendor",
+        "libbinderthreadstate.vndk.29.arm.binder32.vendor",
+        "libblas.vndk.29.arm.binder32.vendor",
+        "libc++.vndk.29.arm.binder32.vendor",
+        "libcompiler_rt.vndk.29.arm.binder32.vendor",
+        "libcutils.vndk.29.arm.binder32.vendor",
+        "libhardware.vndk.29.arm.binder32.vendor",
+        "libhidlbase.vndk.29.arm.binder32.vendor",
+        "libhidlmemory.vndk.29.arm.binder32.vendor",
+        "libhidltransport.vndk.29.arm.binder32.vendor",
+        "libhwbinder.vndk.29.arm.binder32.vendor",
+        "libhwbinder_noltopgo.vndk.29.arm.binder32.vendor",
+        "libion.vndk.29.arm.binder32.vendor",
+        "libjsoncpp.vndk.29.arm.binder32.vendor",
+        "liblzma.vndk.29.arm.binder32.vendor",
+        "libprocessgroup.vndk.29.arm.binder32.vendor",
+        "libunwindstack.vndk.29.arm.binder32.vendor",
+        "libutils.vndk.29.arm.binder32.vendor",
+        "libutilscallstack.vndk.29.arm.binder32.vendor",
+        "libz.vndk.29.arm.binder32.vendor",
+        "ld.config.29.txt",
+        "llndk.libraries.29.txt",
+        "vndksp.libraries.29.txt",
+    ],
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.cameraservice.common@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.common@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.cameraservice.device@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.device@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.cameraservice.service@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.service@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.displayservice@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.displayservice@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.schedulerservice@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.schedulerservice@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.sensorservice@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.sensorservice@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.stats@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.stats@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.vr.composer@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.vr.composer@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.atrace@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.atrace@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.common@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.common@4.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@4.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.common@5.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@5.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.effect@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.effect@4.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@4.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.effect@5.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@5.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio@4.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@4.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio@5.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@5.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.authsecret@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.authsecret@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.automotive.audiocontrol@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.audiocontrol@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.automotive.evs@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.evs@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.automotive.vehicle@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.vehicle@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.biometrics.face@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.face@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.biometrics.fingerprint@2.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.fingerprint@2.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.bluetooth.a2dp@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.a2dp@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.bluetooth.audio@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.audio@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.bluetooth@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.boot@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.boot@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.broadcastradio@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.broadcastradio@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.broadcastradio@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.common@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.common@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@3.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@3.3",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@3.4",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.4.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@3.5",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.5.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.metadata@3.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.metadata@3.3",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.metadata@3.4",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.4.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.provider@2.4",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.4.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.provider@2.5",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.5.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.cas.native@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas.native@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.cas@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.cas@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.configstore-utils",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore-utils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.configstore@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.configstore@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.confirmationui-support-lib",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui-support-lib.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.confirmationui@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.contexthub@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.contexthub@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.drm@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.drm@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.drm@1.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.dumpstate@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.dumpstate@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.fastboot@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.fastboot@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gatekeeper@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gatekeeper@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss.measurement_corrections@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.measurement_corrections@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss.visibility_control@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.visibility_control@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.allocator@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.allocator@3.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@3.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.bufferqueue@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.bufferqueue@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.composer@2.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.composer@2.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.composer@2.3",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.health.storage@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health.storage@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.health@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.health@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.input.classifier@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.classifier@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.input.common@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.common@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.ir@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.ir@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.keymaster@3.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@3.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.keymaster@4.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@4.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.light@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.light@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.media.bufferpool@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.media.bufferpool@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.media.c2@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.c2@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.media.omx@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.omx@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.media@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.memtrack@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.memtrack@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.neuralnetworks@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.neuralnetworks@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.neuralnetworks@1.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.nfc@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.nfc@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.nfc@1.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.oemlock@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.oemlock@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.power.stats@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power.stats@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.power@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.power@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.power@1.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.power@1.3",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio.config@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio.config@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio.config@1.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio.deprecated@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.deprecated@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio@1.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio@1.3",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.radio@1.4",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.4.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.secure_element@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.secure_element@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.sensors@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.sensors@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.soundtrigger@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.soundtrigger@2.0-core",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0-core.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.soundtrigger@2.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.soundtrigger@2.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.tetheroffload.config@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.config@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.tetheroffload.control@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.control@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.thermal@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.thermal@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.thermal@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.tv.cec@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.tv.cec@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.tv.input@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.input@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.usb.gadget@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb.gadget@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.usb@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.usb@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.usb@1.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.vibrator@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.vibrator@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.vibrator@1.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.vibrator@1.3",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.vr@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vr@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.weaver@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.weaver@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi.hostapd@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi.hostapd@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi.offload@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.offload@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi.supplicant@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi.supplicant@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi.supplicant@1.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi@1.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.wifi@1.3",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.allocator@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.allocator@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.memory.block@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.memory.block@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.token@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.token@1.0-utils",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0-utils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.system.net.netd@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.system.net.netd@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.system.suspend@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.system.suspend@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.system.wifi.keystore@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.system.wifi.keystore@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libadf",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libadf.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libaudioroute",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libaudioroute.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libaudioutils",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libbinder",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcamera_metadata",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcamera_metadata.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcap",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libcap.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcap.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libclang_rt.scudo-arm-android",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo-arm-android.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libclang_rt.scudo_minimal-arm-android",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo_minimal-arm-android.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libclang_rt.ubsan_minimal-arm-android",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libclang_rt.ubsan_standalone-arm-android",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.ubsan_standalone-arm-android.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcn-cbor",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcn-cbor.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcodec2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcodec2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcrypto",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libcrypto.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcrypto_utils",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcrypto_utils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcurl",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libcurl.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libdiskconfig",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libdiskconfig.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libdumpstateutil",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libdumpstateutil.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libevent",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libevent.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libevent.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libexif",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libexif.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexif.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libexpat",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libexpat.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libfmq",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libfmq.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libgatekeeper",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libgatekeeper.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libgui",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: false,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libgui.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhardware_legacy",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libhardware_legacy.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhidlallocatorutils",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhidlallocatorutils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhidlcache",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhidlcache.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libjpeg",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libjpeg.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libkeymaster_messages",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libkeymaster_messages.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libkeymaster_portable",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libkeymaster_portable.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libldacBT_abr",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libldacBT_abr.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libldacBT_enc",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libldacBT_enc.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "liblz4",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-liblz4.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libmedia_helper",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libmedia_helper.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libmedia_omx",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libmedia_omx.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libmemtrack",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmemtrack.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libminijail",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libminijail.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libmkbootimg_abi_check",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmkbootimg_abi_check.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libnetutils",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libnetutils.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libnl",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libnl.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnl.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libpcre2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libpcre2.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libpiex",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libpiex.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libpng",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpng.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libpower",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libpower.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpower.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libprocinfo",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprocinfo.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libprotobuf-cpp-full",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libprotobuf-cpp-full.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libprotobuf-cpp-lite",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libprotobuf-cpp-lite.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libpuresoftkeymasterdevice",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libpuresoftkeymasterdevice.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libradio_metadata",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libradio_metadata.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libselinux",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libselinux.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libsoftkeymasterdevice",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libsoftkeymasterdevice.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libspeexresampler",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libspeexresampler.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libsqlite",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libsqlite.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libssl",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libssl.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libssl.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libstagefright_bufferpool@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferpool@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libstagefright_bufferqueue_helper",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libstagefright_foundation",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libstagefright_foundation.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libstagefright_omx",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libstagefright_omx.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libstagefright_omx_utils",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libstagefright_omx_utils.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libstagefright_xmlparser",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_xmlparser.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libsysutils",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libtinyalsa",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libtinyalsa.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libtinyxml2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libtinyxml2.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libui",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libui.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libui.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libusbhost",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libusbhost.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libwifi-system-iface",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libwifi-system-iface.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libxml2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    notice: ":vndk-v29-libxml2.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libyuv",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libyuv.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libziparchive",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libziparchive.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.common@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.common@1.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.common@1.2",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.mapper@2.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.mapper@2.1",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.mapper@3.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@3.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.renderscript@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.renderscript@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.memory.token@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory.token@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.memory@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.memory@1.0-impl",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    relative_install_path: "hw",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hidl.safe_union@1.0",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.safe_union@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libRSCpuRef",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libRSDriver",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libRSDriver.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libRS_internal",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libRS_internal.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libbacktrace",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: false,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libbase",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libbase.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libbcinfo",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libbinderthreadstate",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: false,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libbinderthreadstate.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libblas",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: false,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libblas.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libc++",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libc++.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcompiler_rt",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: false,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libcompiler_rt.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libcutils",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libcutils.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhardware",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libhardware.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhidlbase",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libhidlbase.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhidlmemory",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhidlmemory.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhidltransport",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libhidltransport.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhwbinder",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libhwbinder.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libhwbinder_noltopgo",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libhwbinder_noltopgo.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libion",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libion.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libjsoncpp",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libjsoncpp.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "liblzma",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/liblzma.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libprocessgroup",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libprocessgroup.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libunwindstack",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libutils",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libutils.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libutilscallstack",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libutilscallstack.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "libz",
+    version: "29",
+    target_arch: "arm",
+    binder32bit: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+    notice: ":vndk-v29-libz.so-notice",
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libz.so"],
+        },
+    },
+}
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.common@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.common@2.0.so
new file mode 100755
index 0000000..ed2d4b5
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.common@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.device@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.device@2.0.so
new file mode 100755
index 0000000..3e55be3
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.device@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.service@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.service@2.0.so
new file mode 100755
index 0000000..4540e7f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.cameraservice.service@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.displayservice@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.displayservice@1.0.so
new file mode 100755
index 0000000..c1dbbc2
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.displayservice@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.schedulerservice@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.schedulerservice@1.0.so
new file mode 100755
index 0000000..e14741b
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.schedulerservice@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.sensorservice@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.sensorservice@1.0.so
new file mode 100755
index 0000000..8710e53
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.sensorservice@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.stats@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.stats@1.0.so
new file mode 100755
index 0000000..ebf90b6
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.stats@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.vr.composer@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.vr.composer@1.0.so
new file mode 100755
index 0000000..df15949
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.frameworks.vr.composer@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.atrace@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.atrace@1.0.so
new file mode 100755
index 0000000..ce055c3
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.atrace@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@2.0.so
new file mode 100755
index 0000000..202f7fb
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@4.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@4.0.so
new file mode 100755
index 0000000..6ef2115
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@4.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@5.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@5.0.so
new file mode 100755
index 0000000..dc830b8
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.common@5.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@2.0.so
new file mode 100755
index 0000000..f14d8ce
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@4.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@4.0.so
new file mode 100755
index 0000000..9b358f5
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@4.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@5.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@5.0.so
new file mode 100755
index 0000000..990d743
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio.effect@5.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@2.0.so
new file mode 100755
index 0000000..1da8eb5
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@4.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@4.0.so
new file mode 100755
index 0000000..6339028
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@4.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@5.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@5.0.so
new file mode 100755
index 0000000..1b2c7d3
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.audio@5.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.authsecret@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.authsecret@1.0.so
new file mode 100755
index 0000000..8fb853b
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.authsecret@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.audiocontrol@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.audiocontrol@1.0.so
new file mode 100755
index 0000000..f87b7b7
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.audiocontrol@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.evs@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.evs@1.0.so
new file mode 100755
index 0000000..c347604
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.evs@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.vehicle@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.vehicle@2.0.so
new file mode 100755
index 0000000..fdd3016
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.automotive.vehicle@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.face@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.face@1.0.so
new file mode 100755
index 0000000..34d6732
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.face@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.fingerprint@2.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.fingerprint@2.1.so
new file mode 100755
index 0000000..0a490f7
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.biometrics.fingerprint@2.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.a2dp@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.a2dp@1.0.so
new file mode 100755
index 0000000..492278a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.a2dp@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.audio@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.audio@2.0.so
new file mode 100755
index 0000000..03bb284
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth.audio@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth@1.0.so
new file mode 100755
index 0000000..1fb3ac1
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.bluetooth@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.boot@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.boot@1.0.so
new file mode 100755
index 0000000..6c4a5a1
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.boot@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.0.so
new file mode 100755
index 0000000..3415987
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.1.so
new file mode 100755
index 0000000..ffac19c
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@2.0.so
new file mode 100755
index 0000000..01fefb5
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.broadcastradio@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.common@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.common@1.0.so
new file mode 100755
index 0000000..2b045f1
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.common@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@1.0.so
new file mode 100755
index 0000000..9901441
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.2.so
new file mode 100755
index 0000000..9a48a19
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.3.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.3.so
new file mode 100755
index 0000000..5f85dcd
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.3.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.4.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.4.so
new file mode 100755
index 0000000..ae207f3
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.4.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.5.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.5.so
new file mode 100755
index 0000000..6f1ac4a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.device@3.5.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.2.so
new file mode 100755
index 0000000..da27cbe
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.3.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.3.so
new file mode 100755
index 0000000..a979c63
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.3.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.4.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.4.so
new file mode 100755
index 0000000..2d7aca4
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.metadata@3.4.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.4.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.4.so
new file mode 100755
index 0000000..519929b
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.4.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.5.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.5.so
new file mode 100755
index 0000000..45f29f4
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.camera.provider@2.5.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas.native@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas.native@1.0.so
new file mode 100755
index 0000000..c51b376
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas.native@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.0.so
new file mode 100755
index 0000000..259e263
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.1.so
new file mode 100755
index 0000000..6c49836
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.cas@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore-utils.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore-utils.so
new file mode 100755
index 0000000..78c3a5a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore-utils.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.0.so
new file mode 100755
index 0000000..cb7aeab
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.1.so
new file mode 100755
index 0000000..a306dfc
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.configstore@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui-support-lib.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui-support-lib.so
new file mode 100755
index 0000000..c07cad4
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui-support-lib.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui@1.0.so
new file mode 100755
index 0000000..a0b3e9a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.contexthub@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.contexthub@1.0.so
new file mode 100755
index 0000000..43a83fc
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.contexthub@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.0.so
new file mode 100755
index 0000000..d8c4e3c
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.1.so
new file mode 100755
index 0000000..bec42cd
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.2.so
new file mode 100755
index 0000000..8e27e90
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.drm@1.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.dumpstate@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.dumpstate@1.0.so
new file mode 100755
index 0000000..af721f3
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.dumpstate@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.fastboot@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.fastboot@1.0.so
new file mode 100755
index 0000000..4d617af
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.fastboot@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gatekeeper@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gatekeeper@1.0.so
new file mode 100755
index 0000000..9c3a9ca
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gatekeeper@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.measurement_corrections@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.measurement_corrections@1.0.so
new file mode 100755
index 0000000..c29f78f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.measurement_corrections@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.visibility_control@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.visibility_control@1.0.so
new file mode 100755
index 0000000..ee74387
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss.visibility_control@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.0.so
new file mode 100755
index 0000000..c981a4f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.1.so
new file mode 100755
index 0000000..d4c3c48
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@2.0.so
new file mode 100755
index 0000000..703153a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.gnss@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@2.0.so
new file mode 100755
index 0000000..ea0f992
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@3.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@3.0.so
new file mode 100755
index 0000000..53db257
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.allocator@3.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@1.0.so
new file mode 100755
index 0000000..1f58c2a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@2.0.so
new file mode 100755
index 0000000..780b8b6
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.bufferqueue@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.1.so
new file mode 100755
index 0000000..ca5ced9
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.2.so
new file mode 100755
index 0000000..4639068
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.3.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.3.so
new file mode 100755
index 0000000..067def0
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.graphics.composer@2.3.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health.storage@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health.storage@1.0.so
new file mode 100755
index 0000000..c0ef49a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health.storage@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@1.0.so
new file mode 100755
index 0000000..3c11b90
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@2.0.so
new file mode 100755
index 0000000..96662bc
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.health@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.classifier@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.classifier@1.0.so
new file mode 100755
index 0000000..3242ca2
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.classifier@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.common@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.common@1.0.so
new file mode 100755
index 0000000..7e432ba
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.input.common@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.ir@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.ir@1.0.so
new file mode 100755
index 0000000..c8f92c1
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.ir@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@3.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@3.0.so
new file mode 100755
index 0000000..97a3401
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@3.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@4.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@4.0.so
new file mode 100755
index 0000000..1505881
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.keymaster@4.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.light@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.light@2.0.so
new file mode 100755
index 0000000..0daf89f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.light@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@1.0.so
new file mode 100755
index 0000000..9e6214f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@2.0.so
new file mode 100755
index 0000000..d01feb1
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.bufferpool@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.c2@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.c2@1.0.so
new file mode 100755
index 0000000..d0cd338
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.c2@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.omx@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.omx@1.0.so
new file mode 100755
index 0000000..01ff97a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media.omx@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media@1.0.so
new file mode 100755
index 0000000..1f107f5
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.media@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.memtrack@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.memtrack@1.0.so
new file mode 100755
index 0000000..f44b0a9
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.memtrack@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.0.so
new file mode 100755
index 0000000..1576ba7
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.1.so
new file mode 100755
index 0000000..46ab465
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.2.so
new file mode 100755
index 0000000..dfd67c0
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.neuralnetworks@1.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.0.so
new file mode 100755
index 0000000..eec896a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.1.so
new file mode 100755
index 0000000..54cb492
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.2.so
new file mode 100755
index 0000000..f48b969
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.nfc@1.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.oemlock@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.oemlock@1.0.so
new file mode 100755
index 0000000..24f577c
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.oemlock@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power.stats@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power.stats@1.0.so
new file mode 100755
index 0000000..c5489d2
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power.stats@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.0.so
new file mode 100755
index 0000000..8c05687
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.1.so
new file mode 100755
index 0000000..97727b7
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.2.so
new file mode 100755
index 0000000..3ae75df
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.3.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.3.so
new file mode 100755
index 0000000..deb4659
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.power@1.3.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.0.so
new file mode 100755
index 0000000..ca9a2be
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.1.so
new file mode 100755
index 0000000..333a227
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.2.so
new file mode 100755
index 0000000..ade2b9a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.config@1.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.deprecated@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.deprecated@1.0.so
new file mode 100755
index 0000000..2e8bfca
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio.deprecated@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.0.so
new file mode 100755
index 0000000..b343b24
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.1.so
new file mode 100755
index 0000000..b0c6fca
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.2.so
new file mode 100755
index 0000000..3c90ddd
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.3.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.3.so
new file mode 100755
index 0000000..344dcdf
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.3.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.4.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.4.so
new file mode 100755
index 0000000..6d71119
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.radio@1.4.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.0.so
new file mode 100755
index 0000000..5185af7
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.1.so
new file mode 100755
index 0000000..0f04a9c
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.secure_element@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@1.0.so
new file mode 100755
index 0000000..f7f1046
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@2.0.so
new file mode 100755
index 0000000..2699403
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.sensors@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0-core.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0-core.so
new file mode 100755
index 0000000..26689d7
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0-core.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0.so
new file mode 100755
index 0000000..8559c1b
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.1.so
new file mode 100755
index 0000000..6246d1d
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.2.so
new file mode 100755
index 0000000..b3b35b8
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.soundtrigger@2.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.config@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.config@1.0.so
new file mode 100755
index 0000000..3678b63
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.config@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.control@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.control@1.0.so
new file mode 100755
index 0000000..81e90cc
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tetheroffload.control@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.0.so
new file mode 100755
index 0000000..66522bc
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.1.so
new file mode 100755
index 0000000..a0a5185
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@2.0.so
new file mode 100755
index 0000000..a0a4788
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.thermal@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@1.0.so
new file mode 100755
index 0000000..2647c1a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@2.0.so
new file mode 100755
index 0000000..8ce329e
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.cec@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.input@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.input@1.0.so
new file mode 100755
index 0000000..22d349a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.tv.input@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb.gadget@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb.gadget@1.0.so
new file mode 100755
index 0000000..9cdf0dd
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb.gadget@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.0.so
new file mode 100755
index 0000000..4b67720
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.1.so
new file mode 100755
index 0000000..79c19d5
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.2.so
new file mode 100755
index 0000000..455eb25
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.usb@1.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.0.so
new file mode 100755
index 0000000..9247297
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.1.so
new file mode 100755
index 0000000..3e3de59
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.2.so
new file mode 100755
index 0000000..3280763
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.3.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.3.so
new file mode 100755
index 0000000..633822e
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vibrator@1.3.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vr@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vr@1.0.so
new file mode 100755
index 0000000..270eb33
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.vr@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.weaver@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.weaver@1.0.so
new file mode 100755
index 0000000..a403a09
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.weaver@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.0.so
new file mode 100755
index 0000000..b33a389
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.1.so
new file mode 100755
index 0000000..70822e2
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.hostapd@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.offload@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.offload@1.0.so
new file mode 100755
index 0000000..65b0d51
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.offload@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.0.so
new file mode 100755
index 0000000..b2a06e5
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.1.so
new file mode 100755
index 0000000..82e8cb4
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.2.so
new file mode 100755
index 0000000..d0aa2af
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi.supplicant@1.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.0.so
new file mode 100755
index 0000000..e544873
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.1.so
new file mode 100755
index 0000000..d2e1e0e
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.2.so
new file mode 100755
index 0000000..fe7f713
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.3.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.3.so
new file mode 100755
index 0000000..3e6e299
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.wifi@1.3.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.allocator@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.allocator@1.0.so
new file mode 100755
index 0000000..33667a6
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.allocator@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.memory.block@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.memory.block@1.0.so
new file mode 100755
index 0000000..7064df5
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.memory.block@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0-utils.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0-utils.so
new file mode 100755
index 0000000..c271518
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0-utils.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0.so
new file mode 100755
index 0000000..0f93e19
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.hidl.token@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.0.so
new file mode 100755
index 0000000..532c6c5
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.1.so
new file mode 100755
index 0000000..b71f248
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.system.net.netd@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.system.suspend@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.system.suspend@1.0.so
new file mode 100755
index 0000000..e791885
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.system.suspend@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.system.wifi.keystore@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.system.wifi.keystore@1.0.so
new file mode 100755
index 0000000..7d7a63c
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/android.system.wifi.keystore@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libadf.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libadf.so
new file mode 100755
index 0000000..a0dbf13
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libadf.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so
new file mode 100755
index 0000000..75abce2
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so
new file mode 100755
index 0000000..4f1bd4f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libaudioutils.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so
new file mode 100755
index 0000000..34dc00f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libbinder.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcamera_metadata.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcamera_metadata.so
new file mode 100755
index 0000000..be9797a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcamera_metadata.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcap.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcap.so
new file mode 100755
index 0000000..ac48a3f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcap.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo-arm-android.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo-arm-android.so
new file mode 100644
index 0000000..bcb8f81
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo-arm-android.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo_minimal-arm-android.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo_minimal-arm-android.so
new file mode 100644
index 0000000..3b61d52
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.scudo_minimal-arm-android.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.ubsan_standalone-arm-android.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.ubsan_standalone-arm-android.so
new file mode 100644
index 0000000..3f995d4
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libclang_rt.ubsan_standalone-arm-android.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcn-cbor.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcn-cbor.so
new file mode 100755
index 0000000..72f4504
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcn-cbor.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcodec2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcodec2.so
new file mode 100755
index 0000000..439090e
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcodec2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so
new file mode 100755
index 0000000..695d486
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcrypto_utils.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcrypto_utils.so
new file mode 100755
index 0000000..6936a66
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcrypto_utils.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so
new file mode 100755
index 0000000..15f68f9
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libdiskconfig.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libdiskconfig.so
new file mode 100755
index 0000000..a0f135c
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libdiskconfig.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libdumpstateutil.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libdumpstateutil.so
new file mode 100755
index 0000000..d722730
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libdumpstateutil.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libevent.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libevent.so
new file mode 100755
index 0000000..faae650
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libevent.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libexif.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libexif.so
new file mode 100755
index 0000000..79e94c7
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libexif.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so
new file mode 100755
index 0000000..c8b350b
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libfmq.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libfmq.so
new file mode 100755
index 0000000..f7b8019
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libfmq.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libgatekeeper.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libgatekeeper.so
new file mode 100755
index 0000000..eb91030
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libgatekeeper.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so
new file mode 100755
index 0000000..c5fbb8f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so
new file mode 100755
index 0000000..4e9e5d9
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libhidlallocatorutils.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libhidlallocatorutils.so
new file mode 100755
index 0000000..603b946
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libhidlallocatorutils.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libhidlcache.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libhidlcache.so
new file mode 100755
index 0000000..eb29e58
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libhidlcache.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so
new file mode 100755
index 0000000..cea6744
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so
new file mode 100755
index 0000000..517623c
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so
new file mode 100755
index 0000000..3c1a2d9
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so
new file mode 100755
index 0000000..5753b85
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so
new file mode 100755
index 0000000..2ea2d7b
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so
new file mode 100755
index 0000000..7378500
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so
new file mode 100755
index 0000000..ab4b3ab
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so
new file mode 100755
index 0000000..0f1a517
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmemtrack.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmemtrack.so
new file mode 100755
index 0000000..9e8c29e
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmemtrack.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so
new file mode 100755
index 0000000..da07a32
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmkbootimg_abi_check.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmkbootimg_abi_check.so
new file mode 100755
index 0000000..a2e01eb
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libmkbootimg_abi_check.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so
new file mode 100755
index 0000000..4a7bc96
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libnl.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libnl.so
new file mode 100755
index 0000000..bf6bbcf
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libnl.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so
new file mode 100755
index 0000000..99b12c7
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so
new file mode 100755
index 0000000..dbeabd0
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpng.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpng.so
new file mode 100755
index 0000000..12fb941
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpng.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so
new file mode 100755
index 0000000..bf57b6c
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpower.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libprocinfo.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libprocinfo.so
new file mode 100755
index 0000000..21abd16
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libprocinfo.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so
new file mode 100755
index 0000000..f9496d0
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so
new file mode 100755
index 0000000..c183adc
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so
new file mode 100755
index 0000000..c9097c0
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libradio_metadata.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libradio_metadata.so
new file mode 100755
index 0000000..47f11be
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libradio_metadata.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libselinux.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libselinux.so
new file mode 100755
index 0000000..fcf2dff
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libselinux.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so
new file mode 100755
index 0000000..25739df
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so
new file mode 100755
index 0000000..9e21cb2
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so
new file mode 100755
index 0000000..20f504d
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libssl.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libssl.so
new file mode 100755
index 0000000..3ff4e22
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libssl.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferpool@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferpool@2.0.so
new file mode 100755
index 0000000..99cad7f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferpool@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so
new file mode 100755
index 0000000..c9d1e7c
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_bufferqueue_helper.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so
new file mode 100755
index 0000000..c4d3c7f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
new file mode 100755
index 0000000..7a10d23
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so
new file mode 100755
index 0000000..0ca438f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_xmlparser.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_xmlparser.so
new file mode 100755
index 0000000..c924f1c
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_xmlparser.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so
new file mode 100755
index 0000000..70cff5f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so
new file mode 100755
index 0000000..949201a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so
new file mode 100755
index 0000000..f40ac0b
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libui.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
new file mode 100755
index 0000000..b8521df
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libui.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libusbhost.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libusbhost.so
new file mode 100755
index 0000000..720689d
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libusbhost.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libwifi-system-iface.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libwifi-system-iface.so
new file mode 100755
index 0000000..4392f35
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libwifi-system-iface.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so
new file mode 100755
index 0000000..0e2cdf7
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libyuv.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libyuv.so
new file mode 100755
index 0000000..32c63d9
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libyuv.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libziparchive.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libziparchive.so
new file mode 100755
index 0000000..b52a218
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/libziparchive.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.0.so
new file mode 100755
index 0000000..9c8bd39
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.1.so
new file mode 100755
index 0000000..31d6e59
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.2.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.2.so
new file mode 100755
index 0000000..909a2f0
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.common@1.2.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.0.so
new file mode 100755
index 0000000..aa5f818
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.1.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.1.so
new file mode 100755
index 0000000..52c7e08
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@2.1.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@3.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@3.0.so
new file mode 100755
index 0000000..77bbf72
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.graphics.mapper@3.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.renderscript@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.renderscript@1.0.so
new file mode 100755
index 0000000..3c536cb
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hardware.renderscript@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory.token@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory.token@1.0.so
new file mode 100755
index 0000000..1d7e574
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory.token@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so
new file mode 100755
index 0000000..59938ff
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0.so
new file mode 100755
index 0000000..cf3b24b
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.safe_union@1.0.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.safe_union@1.0.so
new file mode 100755
index 0000000..f45b1fe
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.safe_union@1.0.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so
new file mode 100755
index 0000000..b6c5c5d
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libRSCpuRef.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libRSDriver.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libRSDriver.so
new file mode 100755
index 0000000..327bd43
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libRSDriver.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libRS_internal.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libRS_internal.so
new file mode 100755
index 0000000..4ee976a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libRS_internal.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so
new file mode 100755
index 0000000..c050089
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbacktrace.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbase.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbase.so
new file mode 100755
index 0000000..b33df3e
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbase.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so
new file mode 100755
index 0000000..e03b89c
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbinderthreadstate.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbinderthreadstate.so
new file mode 100755
index 0000000..3ea62f4
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libbinderthreadstate.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so
new file mode 100755
index 0000000..b631b28
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so
new file mode 100755
index 0000000..d9a145f
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so
new file mode 100755
index 0000000..1ebc5e0
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so
new file mode 100755
index 0000000..19b592b
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so
new file mode 100755
index 0000000..d9e7e50
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
new file mode 100755
index 0000000..749fe87
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlmemory.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlmemory.so
new file mode 100755
index 0000000..ecf2d90
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlmemory.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so
new file mode 100755
index 0000000..5029aaf
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so
new file mode 100755
index 0000000..b022b35
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so
new file mode 100755
index 0000000..08410ef
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libion.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libion.so
new file mode 100755
index 0000000..8d68af6
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libion.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libjsoncpp.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libjsoncpp.so
new file mode 100755
index 0000000..484763e
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libjsoncpp.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/liblzma.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/liblzma.so
new file mode 100755
index 0000000..5c1c562
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/liblzma.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libprocessgroup.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libprocessgroup.so
new file mode 100755
index 0000000..35f22b4
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libprocessgroup.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so
new file mode 100755
index 0000000..09e4904
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so
new file mode 100755
index 0000000..812ba2a
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so
new file mode 100755
index 0000000..d627442
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libz.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libz.so
new file mode 100755
index 0000000..f862beb
--- /dev/null
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libz.so
Binary files differ
diff --git a/arm/configs/ld.config.29.txt b/arm/configs/ld.config.29.txt
new file mode 100644
index 0000000..b58e116
--- /dev/null
+++ b/arm/configs/ld.config.29.txt
@@ -0,0 +1,664 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Bionic loader config file.
+#
+
+# Don't change the order here. The first pattern that matches with the
+# absolute path of an executable is selected.
+dir.system = /system/bin/
+dir.system = /system/xbin/
+dir.system = /system/product/bin/
+
+dir.vendor = /odm/bin/
+dir.vendor = /vendor/bin/
+dir.vendor = /data/nativetest/odm
+dir.vendor = /data/nativetest64/odm
+dir.vendor = /data/benchmarktest/odm
+dir.vendor = /data/benchmarktest64/odm
+dir.vendor = /data/nativetest/vendor
+dir.vendor = /data/nativetest64/vendor
+dir.vendor = /data/benchmarktest/vendor
+dir.vendor = /data/benchmarktest64/vendor
+
+dir.unrestricted = /data/nativetest/unrestricted
+dir.unrestricted = /data/nativetest64/unrestricted
+
+# TODO(b/123864775): Ensure tests are run from /data/nativetest{,64} or (if
+# necessary) the unrestricted subdirs above. Then clean this up.
+dir.unrestricted = /data/local/tmp
+
+dir.postinstall = /postinstall
+
+# Fallback entry to provide APEX namespace lookups for binaries anywhere else.
+# This must be last.
+dir.system = /data
+
+[system]
+additional.namespaces = runtime,conscrypt,media,resolv,sphal,vndk,rs
+
+###############################################################################
+# "default" namespace
+#
+# Framework-side code runs in this namespace. Libs from /vendor partition
+# can't be loaded in this namespace.
+###############################################################################
+namespace.default.isolated = true
+
+namespace.default.search.paths  = /system/${LIB}
+namespace.default.search.paths += /system/product/${LIB}
+
+# We can't have entire /system/${LIB} as permitted paths because doing so
+# makes it possible to load libs in /system/${LIB}/vndk* directories by
+# their absolute paths (e.g. dlopen("/system/lib/vndk/libbase.so");).
+# VNDK libs are built with previous versions of Android and thus must not be
+# loaded into this namespace where libs built with the current version of
+# Android are loaded. Mixing the two types of libs in the same namespace can
+# cause unexpected problem.
+namespace.default.permitted.paths  = /system/${LIB}/drm
+namespace.default.permitted.paths += /system/${LIB}/extractors
+namespace.default.permitted.paths += /system/${LIB}/hw
+namespace.default.permitted.paths += /system/product/${LIB}
+# These are where odex files are located. libart has to be able to dlopen the files
+namespace.default.permitted.paths += /system/framework
+namespace.default.permitted.paths += /system/app
+namespace.default.permitted.paths += /system/priv-app
+namespace.default.permitted.paths += /vendor/framework
+namespace.default.permitted.paths += /vendor/app
+namespace.default.permitted.paths += /vendor/priv-app
+namespace.default.permitted.paths += /system/vendor/framework
+namespace.default.permitted.paths += /system/vendor/app
+namespace.default.permitted.paths += /system/vendor/priv-app
+namespace.default.permitted.paths += /odm/framework
+namespace.default.permitted.paths += /odm/app
+namespace.default.permitted.paths += /odm/priv-app
+namespace.default.permitted.paths += /oem/app
+namespace.default.permitted.paths += /system/product/framework
+namespace.default.permitted.paths += /system/product/app
+namespace.default.permitted.paths += /system/product/priv-app
+namespace.default.permitted.paths += /data
+namespace.default.permitted.paths += /mnt/expand
+namespace.default.permitted.paths += /apex/com.android.runtime/${LIB}/bionic
+namespace.default.permitted.paths += /system/${LIB}/bootstrap
+
+namespace.default.asan.search.paths  = /data/asan/system/${LIB}
+namespace.default.asan.search.paths +=           /system/${LIB}
+namespace.default.asan.search.paths += /data/asan/system/product/${LIB}
+namespace.default.asan.search.paths +=           /system/product/${LIB}
+
+namespace.default.asan.permitted.paths  = /data
+namespace.default.asan.permitted.paths += /system/${LIB}/drm
+namespace.default.asan.permitted.paths += /system/${LIB}/extractors
+namespace.default.asan.permitted.paths += /system/${LIB}/hw
+namespace.default.asan.permitted.paths += /system/framework
+namespace.default.asan.permitted.paths += /system/app
+namespace.default.asan.permitted.paths += /system/priv-app
+namespace.default.asan.permitted.paths += /vendor/framework
+namespace.default.asan.permitted.paths += /vendor/app
+namespace.default.asan.permitted.paths += /vendor/priv-app
+namespace.default.asan.permitted.paths += /system/vendor/framework
+namespace.default.asan.permitted.paths += /system/vendor/app
+namespace.default.asan.permitted.paths += /system/vendor/priv-app
+namespace.default.asan.permitted.paths += /odm/framework
+namespace.default.asan.permitted.paths += /odm/app
+namespace.default.asan.permitted.paths += /odm/priv-app
+namespace.default.asan.permitted.paths += /oem/app
+namespace.default.asan.permitted.paths += /system/product/${LIB}
+namespace.default.asan.permitted.paths += /system/product/framework
+namespace.default.asan.permitted.paths += /system/product/app
+namespace.default.asan.permitted.paths += /system/product/priv-app
+namespace.default.asan.permitted.paths += /mnt/expand
+namespace.default.asan.permitted.paths += /apex/com.android.runtime/${LIB}/bionic
+namespace.default.asan.permitted.paths += /system/${LIB}/bootstrap
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+# If a shared library or an executable requests a shared library that
+# cannot be loaded into the default namespace, the dynamic linker tries
+# to load the shared library from the runtime namespace. And then, if the
+# shared library cannot be loaded from the runtime namespace either, the
+# dynamic linker tries to load the shared library from the resolv namespace.
+# Finally, if all attempts fail, the dynamic linker returns an error.
+namespace.default.links = runtime,resolv
+# Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by
+# libart.
+namespace.default.visible = true
+namespace.default.link.runtime.shared_libs  = libdexfile_external.so
+# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466
+namespace.default.link.runtime.shared_libs += libicui18n.so
+namespace.default.link.runtime.shared_libs += libicuuc.so
+namespace.default.link.runtime.shared_libs += libnativebridge.so
+namespace.default.link.runtime.shared_libs += libnativehelper.so
+namespace.default.link.runtime.shared_libs += libnativeloader.so
+namespace.default.link.runtime.shared_libs += libandroidicu.so
+
+# TODO(b/122876336): Remove libpac.so once it's migrated to Webview
+namespace.default.link.runtime.shared_libs += libpac.so
+
+# When libnetd_resolv.so can't be found in the default namespace, search for it
+# in the resolv namespace. Don't allow any other libraries from the resolv namespace
+# to be loaded in the default namespace.
+namespace.default.link.resolv.shared_libs = libnetd_resolv.so
+
+###############################################################################
+# "runtime" APEX namespace
+#
+# This namespace exposes externally accessible libraries from the Runtime APEX.
+###############################################################################
+namespace.runtime.isolated = true
+namespace.runtime.visible = true
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.links = default
+# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library
+# when it exists.
+namespace.runtime.link.default.allow_all_shared_libs = true
+
+###############################################################################
+# "media" APEX namespace
+#
+# This namespace is for libraries within the media APEX.
+###############################################################################
+namespace.media.isolated = true
+namespace.media.visible = true
+
+namespace.media.search.paths = /apex/com.android.media/${LIB}
+namespace.media.asan.search.paths = /apex/com.android.media/${LIB}
+
+namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors
+namespace.media.asan.permitted.paths = /apex/com.android.media/${LIB}/extractors
+
+namespace.media.links = default
+namespace.media.link.default.shared_libs  = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-arm-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.media.link.default.shared_libs += libbinder_ndk.so
+namespace.media.link.default.shared_libs += libcgrouprc.so
+namespace.media.link.default.shared_libs += libmediametrics.so
+namespace.media.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+###############################################################################
+# "conscrypt" APEX namespace
+#
+# This namespace is for libraries within the conscrypt APEX.
+###############################################################################
+namespace.conscrypt.isolated = true
+namespace.conscrypt.visible = true
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}
+namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB}
+namespace.conscrypt.links = runtime,default
+namespace.conscrypt.link.runtime.shared_libs  = libandroidio.so
+namespace.conscrypt.link.default.shared_libs  = libc.so
+namespace.conscrypt.link.default.shared_libs += libm.so
+namespace.conscrypt.link.default.shared_libs += libdl.so
+namespace.conscrypt.link.default.shared_libs += liblog.so
+
+###############################################################################
+# "resolv" APEX namespace
+#
+# This namespace is for libraries within the resolv APEX.
+###############################################################################
+namespace.resolv.isolated = true
+namespace.resolv.visible = true
+
+namespace.resolv.search.paths = /apex/com.android.resolv/${LIB}
+namespace.resolv.asan.search.paths = /apex/com.android.resolv/${LIB}
+namespace.resolv.links = default
+namespace.resolv.link.default.shared_libs  = libc.so
+namespace.resolv.link.default.shared_libs += libcgrouprc.so
+namespace.resolv.link.default.shared_libs += libm.so
+namespace.resolv.link.default.shared_libs += libdl.so
+namespace.resolv.link.default.shared_libs += libbinder_ndk.so
+namespace.resolv.link.default.shared_libs += liblog.so
+namespace.resolv.link.default.shared_libs += libvndksupport.so
+
+###############################################################################
+# "sphal" namespace
+#
+# SP-HAL(Sameprocess-HAL)s are the only vendor libraries that are allowed to be
+# loaded inside system processes. libEGL_<chipset>.so, libGLESv2_<chipset>.so,
+# android.hardware.graphics.mapper@2.0-impl.so, etc are SP-HALs.
+#
+# This namespace is exclusivly for SP-HALs. When the framework tries to dynami-
+# cally load SP-HALs, android_dlopen_ext() is used to explicitly specifying
+# that they should be searched and loaded from this namespace.
+#
+# Note that there is no link from the default namespace to this namespace.
+###############################################################################
+namespace.sphal.isolated = true
+namespace.sphal.visible = true
+
+namespace.sphal.search.paths  = /odm/${LIB}
+namespace.sphal.search.paths += /vendor/${LIB}
+namespace.sphal.search.paths += /vendor/${LIB}/hw
+
+namespace.sphal.permitted.paths  = /odm/${LIB}
+namespace.sphal.permitted.paths += /vendor/${LIB}
+namespace.sphal.permitted.paths += /system/vendor/${LIB}
+
+namespace.sphal.asan.search.paths  = /data/asan/odm/${LIB}
+namespace.sphal.asan.search.paths +=           /odm/${LIB}
+namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
+namespace.sphal.asan.search.paths +=           /vendor/${LIB}
+
+namespace.sphal.asan.permitted.paths  = /data/asan/odm/${LIB}
+namespace.sphal.asan.permitted.paths +=           /odm/${LIB}
+namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
+namespace.sphal.asan.permitted.paths +=           /vendor/${LIB}
+
+# Once in this namespace, access to libraries in /system/lib is restricted. Only
+# libs listed here can be used. Order is important here as the namespaces are
+# tried in this order. rs should be before vndk because both are capable
+# of loading libRS_internal.so
+namespace.sphal.links = rs,default,vndk
+
+# Renderscript gets separate namespace
+namespace.sphal.link.rs.shared_libs = libRS_internal.so
+
+namespace.sphal.link.default.shared_libs  = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-arm-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbacktrace.so:libbase.so:libbcinfo.so:libbinderthreadstate.so:libblas.so:libc++.so:libcompiler_rt.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libhwbinder.so:libhwbinder_noltopgo.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
+
+###############################################################################
+# "rs" namespace
+#
+# This namespace is exclusively for Renderscript internal libraries.
+# This namespace has slightly looser restriction than the vndk namespace because
+# of the genuine characteristics of Renderscript; /data is in the permitted path
+# to load the compiled *.so file and libmediandk.so can be used here.
+###############################################################################
+namespace.rs.isolated = true
+namespace.rs.visible = true
+
+namespace.rs.search.paths  = /odm/${LIB}/vndk-sp
+namespace.rs.search.paths += /vendor/${LIB}/vndk-sp
+namespace.rs.search.paths += /system/${LIB}/vndk-sp-29
+namespace.rs.search.paths += /odm/${LIB}
+namespace.rs.search.paths += /vendor/${LIB}
+
+namespace.rs.permitted.paths  = /odm/${LIB}
+namespace.rs.permitted.paths += /vendor/${LIB}
+namespace.rs.permitted.paths += /system/vendor/${LIB}
+namespace.rs.permitted.paths += /data
+
+namespace.rs.asan.search.paths  = /data/asan/odm/${LIB}/vndk-sp
+namespace.rs.asan.search.paths +=           /odm/${LIB}/vndk-sp
+namespace.rs.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp
+namespace.rs.asan.search.paths +=           /vendor/${LIB}/vndk-sp
+namespace.rs.asan.search.paths += /data/asan/system/${LIB}/vndk-sp-29
+namespace.rs.asan.search.paths +=           /system/${LIB}/vndk-sp-29
+namespace.rs.asan.search.paths += /data/asan/odm/${LIB}
+namespace.rs.asan.search.paths +=           /odm/${LIB}
+namespace.rs.asan.search.paths += /data/asan/vendor/${LIB}
+namespace.rs.asan.search.paths +=           /vendor/${LIB}
+
+namespace.rs.asan.permitted.paths  = /data/asan/odm/${LIB}
+namespace.rs.asan.permitted.paths +=           /odm/${LIB}
+namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB}
+namespace.rs.asan.permitted.paths +=           /vendor/${LIB}
+namespace.rs.asan.permitted.paths += /data
+
+namespace.rs.links = default,vndk
+
+namespace.rs.link.default.shared_libs  = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-arm-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+# Private LLNDK libs (e.g. libft2.so) are exceptionally allowed to this
+# namespace because RS framework libs are using them.
+namespace.rs.link.default.shared_libs += 
+
+namespace.rs.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbacktrace.so:libbase.so:libbcinfo.so:libbinderthreadstate.so:libblas.so:libc++.so:libcompiler_rt.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libhwbinder.so:libhwbinder_noltopgo.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
+
+###############################################################################
+# "vndk" namespace
+#
+# This namespace is exclusively for vndk-sp libs.
+###############################################################################
+namespace.vndk.isolated = true
+namespace.vndk.visible = true
+
+namespace.vndk.search.paths  = /odm/${LIB}/vndk-sp
+namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp
+namespace.vndk.search.paths += /system/${LIB}/vndk-sp-29
+
+namespace.vndk.permitted.paths  = /odm/${LIB}/hw
+namespace.vndk.permitted.paths += /odm/${LIB}/egl
+namespace.vndk.permitted.paths += /vendor/${LIB}/hw
+namespace.vndk.permitted.paths += /vendor/${LIB}/egl
+namespace.vndk.permitted.paths += /system/vendor/${LIB}/hw
+namespace.vndk.permitted.paths += /system/vendor/${LIB}/egl
+# This is exceptionally required since android.hidl.memory@1.0-impl.so is here
+namespace.vndk.permitted.paths += /system/${LIB}/vndk-sp-29/hw
+
+namespace.vndk.asan.search.paths  = /data/asan/odm/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths +=           /odm/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths +=           /vendor/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-sp-29
+namespace.vndk.asan.search.paths +=           /system/${LIB}/vndk-sp-29
+
+namespace.vndk.asan.permitted.paths  = /data/asan/odm/${LIB}/hw
+namespace.vndk.asan.permitted.paths +=           /odm/${LIB}/hw
+namespace.vndk.asan.permitted.paths += /data/asan/odm/${LIB}/egl
+namespace.vndk.asan.permitted.paths +=           /odm/${LIB}/egl
+namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/hw
+namespace.vndk.asan.permitted.paths +=           /vendor/${LIB}/hw
+namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl
+namespace.vndk.asan.permitted.paths +=           /vendor/${LIB}/egl
+
+namespace.vndk.asan.permitted.paths += /data/asan/system/${LIB}/vndk-sp-29/hw
+namespace.vndk.asan.permitted.paths +=           /system/${LIB}/vndk-sp-29/hw
+
+# The "vndk" namespace links to "default" namespace for LLNDK libs and links to
+# "sphal" namespace for vendor libs.  The ordering matters.  The "default"
+# namespace has higher priority than the "sphal" namespace.
+namespace.vndk.links = default,sphal
+
+# When these NDK libs are required inside this namespace, then it is redirected
+# to the default namespace. This is possible since their ABI is stable across
+# Android releases.
+namespace.vndk.link.default.shared_libs  = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-arm-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+# Allow VNDK-SP extensions to use vendor libraries
+namespace.vndk.link.sphal.allow_all_shared_libs = true
+
+
+###############################################################################
+# Namespace config for vendor processes. In O, no restriction is enforced for
+# them. However, in O-MR1, access to /system/${LIB} will not be allowed to
+# the default namespace. 'system' namespace will be added to give limited
+# (LL-NDK only) access.
+###############################################################################
+[vendor]
+additional.namespaces = runtime,system,vndk
+
+###############################################################################
+# "default" namespace
+#
+# This is the default linker namespace for a vendor process (a process started
+# from /vendor/bin/*). The main executable and the libs under /vendor/lib[64]
+# are loaded directly into this namespace. However, other libs under the system
+# partition (VNDK and LLNDK libraries) are not loaded here but from the
+# separate namespace 'system'. The delegation to the system namespace is done
+# via the 'namespace.default.link.system.shared_libs' property below.
+#
+# '#VNDK27#' TAG is only for building ld.config.27.txt for backward
+# compatibility. (TODO:b/123390078) Move them to a separate file.
+###############################################################################
+namespace.default.isolated = true
+namespace.default.visible = true
+
+namespace.default.search.paths  = /odm/${LIB}
+namespace.default.search.paths += /vendor/${LIB}
+
+namespace.default.permitted.paths  = /odm
+namespace.default.permitted.paths += /vendor
+namespace.default.permitted.paths += /system/vendor
+
+namespace.default.asan.search.paths  = /data/asan/odm/${LIB}
+namespace.default.asan.search.paths +=           /odm/${LIB}
+namespace.default.asan.search.paths += /data/asan/vendor/${LIB}
+namespace.default.asan.search.paths +=           /vendor/${LIB}
+
+namespace.default.asan.permitted.paths  = /data/asan/odm
+namespace.default.asan.permitted.paths +=           /odm
+namespace.default.asan.permitted.paths += /data/asan/vendor
+namespace.default.asan.permitted.paths +=           /vendor
+
+namespace.default.links = system,vndk
+namespace.default.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-arm-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+
+namespace.default.link.vndk.shared_libs  = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbacktrace.so:libbase.so:libbcinfo.so:libbinderthreadstate.so:libblas.so:libc++.so:libcompiler_rt.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libhwbinder.so:libhwbinder_noltopgo.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
+namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.common@2.0.so:android.frameworks.cameraservice.device@2.0.so:android.frameworks.cameraservice.service@2.0.so:android.frameworks.displayservice@1.0.so:android.frameworks.schedulerservice@1.0.so:android.frameworks.sensorservice@1.0.so:android.frameworks.stats@1.0.so:android.frameworks.vr.composer@1.0.so:android.hardware.atrace@1.0.so:android.hardware.audio.common@2.0.so:android.hardware.audio.common@4.0.so:android.hardware.audio.common@5.0.so:android.hardware.audio.effect@2.0.so:android.hardware.audio.effect@4.0.so:android.hardware.audio.effect@5.0.so:android.hardware.audio@2.0.so:android.hardware.audio@4.0.so:android.hardware.audio@5.0.so:android.hardware.authsecret@1.0.so:android.hardware.automotive.audiocontrol@1.0.so:android.hardware.automotive.evs@1.0.so:android.hardware.automotive.vehicle@2.0.so:android.hardware.biometrics.face@1.0.so:android.hardware.biometrics.fingerprint@2.1.so:android.hardware.bluetooth.a2dp@1.0.so:android.hardware.bluetooth.audio@2.0.so:android.hardware.bluetooth@1.0.so:android.hardware.boot@1.0.so:android.hardware.broadcastradio@1.0.so:android.hardware.broadcastradio@1.1.so:android.hardware.broadcastradio@2.0.so:android.hardware.camera.common@1.0.so:android.hardware.camera.device@1.0.so:android.hardware.camera.device@3.2.so:android.hardware.camera.device@3.3.so:android.hardware.camera.device@3.4.so:android.hardware.camera.device@3.5.so:android.hardware.camera.metadata@3.2.so:android.hardware.camera.metadata@3.3.so:android.hardware.camera.metadata@3.4.so:android.hardware.camera.provider@2.4.so:android.hardware.camera.provider@2.5.so:android.hardware.cas.native@1.0.so:android.hardware.cas@1.0.so:android.hardware.cas@1.1.so:android.hardware.configstore-utils.so:android.hardware.configstore@1.0.so:android.hardware.configstore@1.1.so:android.hardware.confirmationui-support-lib.so:android.hardware.confirmationui@1.0.so:android.hardware.contexthub@1.0.so:android.hardware.drm@1.0.so:android.hardware.drm@1.1.so:android.hardware.drm@1.2.so:android.hardware.dumpstate@1.0.so:android.hardware.fastboot@1.0.so:android.hardware.gatekeeper@1.0.so:android.hardware.gnss.measurement_corrections@1.0.so:android.hardware.gnss.visibility_control@1.0.so:android.hardware.gnss@1.0.so:android.hardware.gnss@1.1.so:android.hardware.gnss@2.0.so:android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.allocator@3.0.so:android.hardware.graphics.bufferqueue@1.0.so:android.hardware.graphics.bufferqueue@2.0.so:android.hardware.graphics.composer@2.1.so:android.hardware.graphics.composer@2.2.so:android.hardware.graphics.composer@2.3.so:android.hardware.health.storage@1.0.so:android.hardware.health@1.0.so:android.hardware.health@2.0.so:android.hardware.input.classifier@1.0.so:android.hardware.input.common@1.0.so:android.hardware.ir@1.0.so:android.hardware.keymaster@3.0.so:android.hardware.keymaster@4.0.so:android.hardware.light@2.0.so:android.hardware.media.bufferpool@1.0.so:android.hardware.media.bufferpool@2.0.so:android.hardware.media.c2@1.0.so:android.hardware.media.omx@1.0.so:android.hardware.media@1.0.so:android.hardware.memtrack@1.0.so:android.hardware.neuralnetworks@1.0.so:android.hardware.neuralnetworks@1.1.so:android.hardware.neuralnetworks@1.2.so:android.hardware.nfc@1.0.so:android.hardware.nfc@1.1.so:android.hardware.nfc@1.2.so:android.hardware.oemlock@1.0.so:android.hardware.power.stats@1.0.so:android.hardware.power@1.0.so:android.hardware.power@1.1.so:android.hardware.power@1.2.so:android.hardware.power@1.3.so:android.hardware.radio.config@1.0.so:android.hardware.radio.config@1.1.so:android.hardware.radio.config@1.2.so:android.hardware.radio.deprecated@1.0.so:android.hardware.radio@1.0.so:android.hardware.radio@1.1.so:android.hardware.radio@1.2.so:android.hardware.radio@1.3.so:android.hardware.radio@1.4.so:android.hardware.secure_element@1.0.so:android.hardware.secure_element@1.1.so:android.hardware.sensors@1.0.so:android.hardware.sensors@2.0.so:android.hardware.soundtrigger@2.0.so:android.hardware.soundtrigger@2.0-core.so:android.hardware.soundtrigger@2.1.so:android.hardware.soundtrigger@2.2.so:android.hardware.tetheroffload.config@1.0.so:android.hardware.tetheroffload.control@1.0.so:android.hardware.thermal@1.0.so:android.hardware.thermal@1.1.so:android.hardware.thermal@2.0.so:android.hardware.tv.cec@1.0.so:android.hardware.tv.cec@2.0.so:android.hardware.tv.input@1.0.so:android.hardware.usb.gadget@1.0.so:android.hardware.usb@1.0.so:android.hardware.usb@1.1.so:android.hardware.usb@1.2.so:android.hardware.vibrator@1.0.so:android.hardware.vibrator@1.1.so:android.hardware.vibrator@1.2.so:android.hardware.vibrator@1.3.so:android.hardware.vr@1.0.so:android.hardware.weaver@1.0.so:android.hardware.wifi.hostapd@1.0.so:android.hardware.wifi.hostapd@1.1.so:android.hardware.wifi.offload@1.0.so:android.hardware.wifi.supplicant@1.0.so:android.hardware.wifi.supplicant@1.1.so:android.hardware.wifi.supplicant@1.2.so:android.hardware.wifi@1.0.so:android.hardware.wifi@1.1.so:android.hardware.wifi@1.2.so:android.hardware.wifi@1.3.so:android.hidl.allocator@1.0.so:android.hidl.memory.block@1.0.so:android.hidl.token@1.0.so:android.hidl.token@1.0-utils.so:android.system.net.netd@1.0.so:android.system.net.netd@1.1.so:android.system.suspend@1.0.so:android.system.wifi.keystore@1.0.so:libadf.so:libaudioroute.so:libaudioutils.so:libbinder.so:libcamera_metadata.so:libcap.so:libclang_rt.scudo-arm-android.so:libclang_rt.scudo_minimal-arm-android.so:libclang_rt.ubsan_minimal-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libcn-cbor.so:libcodec2.so:libcrypto.so:libcrypto_utils.so:libcurl.so:libdiskconfig.so:libdumpstateutil.so:libevent.so:libexif.so:libexpat.so:libfmq.so:libgatekeeper.so:libgui.so:libhardware_legacy.so:libhidlallocatorutils.so:libhidlcache.so:libjpeg.so:libkeymaster_messages.so:libkeymaster_portable.so:libldacBT_abr.so:libldacBT_enc.so:liblz4.so:libmedia_helper.so:libmedia_omx.so:libmemtrack.so:libminijail.so:libmkbootimg_abi_check.so:libnetutils.so:libnl.so:libpcre2.so:libpiex.so:libpng.so:libpower.so:libprocinfo.so:libprotobuf-cpp-full.so:libprotobuf-cpp-lite.so:libpuresoftkeymasterdevice.so:libradio_metadata.so:libselinux.so:libsoftkeymasterdevice.so:libspeexresampler.so:libsqlite.so:libssl.so:libstagefright_bufferpool@2.0.so:libstagefright_bufferqueue_helper.so:libstagefright_foundation.so:libstagefright_omx.so:libstagefright_omx_utils.so:libstagefright_xmlparser.so:libsysutils.so:libtinyalsa.so:libtinyxml2.so:libui.so:libusbhost.so:libwifi-system-iface.so:libxml2.so:libyuv.so:libziparchive.so
+
+###############################################################################
+# "runtime" APEX namespace
+#
+# This namespace exposes externally accessible libraries from the Runtime APEX.
+###############################################################################
+namespace.runtime.isolated = true
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.links = system
+# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library
+# when it exists.
+namespace.runtime.link.system.allow_all_shared_libs = true
+
+###############################################################################
+# "vndk" namespace
+#
+# This namespace is where VNDK and VNDK-SP libraries are loaded for
+# a vendor process.
+###############################################################################
+namespace.vndk.isolated = false
+
+namespace.vndk.search.paths  = /odm/${LIB}/vndk
+namespace.vndk.search.paths += /odm/${LIB}/vndk-sp
+namespace.vndk.search.paths += /vendor/${LIB}/vndk
+namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp
+namespace.vndk.search.paths += /system/${LIB}/vndk-sp-29
+namespace.vndk.search.paths += /system/${LIB}/vndk-29
+
+namespace.vndk.asan.search.paths  = /data/asan/odm/${LIB}/vndk
+namespace.vndk.asan.search.paths +=           /odm/${LIB}/vndk
+namespace.vndk.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths +=           /odm/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk
+namespace.vndk.asan.search.paths +=           /vendor/${LIB}/vndk
+namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths +=           /vendor/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-sp-29
+namespace.vndk.asan.search.paths +=           /system/${LIB}/vndk-sp-29
+namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-29
+namespace.vndk.asan.search.paths +=           /system/${LIB}/vndk-29
+
+# When these NDK libs are required inside this namespace, then it is redirected
+# to the system namespace. This is possible since their ABI is stable across
+# Android releases.  The links here should be identical to that of the
+# 'vndk_in_system' namespace, except for the link between 'vndk' and
+# 'vndk_in_system'.
+namespace.vndk.links = system,default
+
+namespace.vndk.link.system.shared_libs  = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-arm-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+namespace.vndk.link.default.allow_all_shared_libs = true
+
+
+
+###############################################################################
+# "system" namespace
+#
+# This namespace is where system libs (VNDK and LLNDK libs) are loaded for
+# a vendor process.
+###############################################################################
+namespace.system.isolated = false
+
+namespace.system.search.paths  = /system/${LIB}
+namespace.system.search.paths += /system/product/${LIB}
+
+namespace.system.asan.search.paths  = /data/asan/system/${LIB}
+namespace.system.asan.search.paths +=           /system/${LIB}
+namespace.system.asan.search.paths += /data/asan/product/${LIB}
+namespace.system.asan.search.paths +=           /system/product/${LIB}
+namespace.system.asan.search.paths += /data/asan/product_services/${LIB}
+
+namespace.system.links = runtime
+namespace.system.link.runtime.shared_libs  = libdexfile_external.so
+# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466
+namespace.system.link.runtime.shared_libs += libicui18n.so
+namespace.system.link.runtime.shared_libs += libicuuc.so
+namespace.system.link.runtime.shared_libs += libnativebridge.so
+namespace.system.link.runtime.shared_libs += libnativehelper.so
+namespace.system.link.runtime.shared_libs += libnativeloader.so
+# Workaround for b/124772622
+namespace.system.link.runtime.shared_libs += libandroidicu.so
+
+###############################################################################
+# "vndk_in_system" namespace
+#
+# This namespace is where no-vendor-variant VNDK libraries are loaded for a
+# vendor process.  Note that we do not simply export these libraries from
+# "system" namespace, because in some case both the core variant and the
+# vendor variant of a VNDK library may be loaded.  In such case, we do not
+# want to eliminate double-loading because doing so means the global states
+# of the library would be shared.
+#
+# Only the no-vendor-variant VNDK libraries are whitelisted in this namespace.
+# This is to ensure that we do not load libraries needed by no-vendor-variant
+# VNDK libraries into vndk_in_system namespace.
+###############################################################################
+namespace.vndk_in_system.isolated = true
+namespace.vndk_in_system.visible = true
+
+# The search paths here should be kept the same as that of the 'system'
+# namespace.
+namespace.vndk_in_system.search.paths  = /system/${LIB}
+namespace.vndk_in_system.search.paths += /system/product/${LIB}
+
+namespace.vndk_in_system.asan.search.paths  = /data/asan/system/${LIB}
+namespace.vndk_in_system.asan.search.paths +=           /system/${LIB}
+namespace.vndk_in_system.asan.search.paths += /data/asan/product/${LIB}
+namespace.vndk_in_system.asan.search.paths +=           /system/product/${LIB}
+namespace.vndk_in_system.asan.search.paths += /data/asan/product_services/${LIB}
+
+
+
+# The links here should be identical to that of the 'vndk' namespace, with the
+# following exception:
+#   1. 'vndk_in_system' needs to be freely linked back to 'vndk'.
+#   2. 'vndk_in_system' does not need to link to 'default', as any library that
+#      requires anything vendor would not be a vndk_in_system library.
+namespace.vndk_in_system.links = vndk,system
+
+namespace.vndk_in_system.link.system.shared_libs  = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-arm-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.vndk_in_system.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+namespace.vndk_in_system.link.vndk.allow_all_shared_libs = true
+
+
+###############################################################################
+# Namespace config for native tests that need access to both system and vendor
+# libraries. This replicates the default linker config (done by
+# init_default_namespace_no_config in bionic/linker/linker.cpp), except that it
+# includes the requisite namespace setup for APEXes.
+###############################################################################
+[unrestricted]
+additional.namespaces = runtime,media,conscrypt,resolv
+
+namespace.default.search.paths  = /system/${LIB}
+namespace.default.search.paths += /odm/${LIB}
+namespace.default.search.paths += /vendor/${LIB}
+
+namespace.default.asan.search.paths  = /data/asan/system/${LIB}
+namespace.default.asan.search.paths +=           /system/${LIB}
+namespace.default.asan.search.paths += /data/asan/odm/${LIB}
+namespace.default.asan.search.paths +=           /odm/${LIB}
+namespace.default.asan.search.paths += /data/asan/vendor/${LIB}
+namespace.default.asan.search.paths +=           /vendor/${LIB}
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+namespace.default.links = runtime,resolv
+namespace.default.visible = true
+
+namespace.default.link.runtime.shared_libs  = libdexfile_external.so
+# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466
+namespace.default.link.runtime.shared_libs += libicui18n.so
+namespace.default.link.runtime.shared_libs += libicuuc.so
+namespace.default.link.runtime.shared_libs += libnativebridge.so
+namespace.default.link.runtime.shared_libs += libnativehelper.so
+namespace.default.link.runtime.shared_libs += libnativeloader.so
+namespace.default.link.runtime.shared_libs += libandroidicu.so
+
+# TODO(b/122876336): Remove libpac.so once it's migrated to Webview
+namespace.default.link.runtime.shared_libs += libpac.so
+
+namespace.default.link.resolv.shared_libs = libnetd_resolv.so
+
+###############################################################################
+# "runtime" APEX namespace
+#
+# This namespace exposes externally accessible libraries from the Runtime APEX.
+###############################################################################
+namespace.runtime.isolated = true
+namespace.runtime.visible = true
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.links = default
+# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library
+# when it exists.
+namespace.runtime.link.default.allow_all_shared_libs = true
+
+###############################################################################
+# "media" APEX namespace
+#
+# This namespace is for libraries within the media APEX.
+###############################################################################
+namespace.media.isolated = true
+namespace.media.visible = true
+
+namespace.media.search.paths = /apex/com.android.media/${LIB}
+namespace.media.asan.search.paths = /apex/com.android.media/${LIB}
+
+namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors
+namespace.media.asan.permitted.paths = /apex/com.android.media/${LIB}/extractors
+
+namespace.media.links = default
+namespace.media.link.default.shared_libs  = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-arm-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.media.link.default.shared_libs += libbinder_ndk.so
+namespace.media.link.default.shared_libs += libmediametrics.so
+namespace.media.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+###############################################################################
+# "conscrypt" APEX namespace
+#
+# This namespace is for libraries within the conscrypt APEX.
+###############################################################################
+namespace.conscrypt.isolated = true
+namespace.conscrypt.visible = true
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}
+namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB}
+namespace.conscrypt.links = runtime,default
+namespace.conscrypt.link.runtime.shared_libs  = libandroidio.so
+namespace.conscrypt.link.default.shared_libs  = libc.so
+namespace.conscrypt.link.default.shared_libs += libm.so
+namespace.conscrypt.link.default.shared_libs += libdl.so
+namespace.conscrypt.link.default.shared_libs += liblog.so
+
+###############################################################################
+# "resolv" APEX namespace
+#
+# This namespace is for libraries within the resolv APEX.
+###############################################################################
+namespace.resolv.isolated = true
+namespace.resolv.visible = true
+
+namespace.resolv.search.paths = /apex/com.android.resolv/${LIB}
+namespace.resolv.asan.search.paths = /apex/com.android.resolv/${LIB}
+namespace.resolv.links = default
+namespace.resolv.link.default.shared_libs  = libc.so
+namespace.resolv.link.default.shared_libs += libm.so
+namespace.resolv.link.default.shared_libs += libdl.so
+namespace.resolv.link.default.shared_libs += libbinder_ndk.so
+namespace.resolv.link.default.shared_libs += liblog.so
+
+
+###############################################################################
+# Namespace config for binaries under /postinstall.
+# Only default namespace is defined and default has no directories
+# other than /system/lib in the search paths. This is because linker calls
+# realpath on the search paths and this causes selinux denial if the paths
+# (/vendor, /odm) are not allowed to the postinstall binaries. There is no
+# reason to allow the binaries to access the paths.
+###############################################################################
+[postinstall]
+namespace.default.isolated = false
+namespace.default.search.paths  = /system/${LIB}
+namespace.default.search.paths += /system/product/${LIB}
diff --git a/arm/configs/llndk.libraries.29.txt b/arm/configs/llndk.libraries.29.txt
new file mode 100644
index 0000000..8f7cbbd
--- /dev/null
+++ b/arm/configs/llndk.libraries.29.txt
@@ -0,0 +1,19 @@
+libEGL.so
+libGLESv1_CM.so
+libGLESv2.so
+libGLESv3.so
+libRS.so
+libandroid_net.so
+libc.so
+libcgrouprc.so
+libclang_rt.asan-arm-android.so
+libdl.so
+libft2.so
+liblog.so
+libm.so
+libmediandk.so
+libnativewindow.so
+libneuralnetworks.so
+libsync.so
+libvndksupport.so
+libvulkan.so
diff --git a/arm/configs/module_paths.txt b/arm/configs/module_paths.txt
new file mode 100644
index 0000000..b6449a5
--- /dev/null
+++ b/arm/configs/module_paths.txt
@@ -0,0 +1,253 @@
+android.frameworks.cameraservice.common@2.0.so frameworks/hardware/interfaces/cameraservice/common/2.0 frameworks/hardware/interfaces/cameraservice/common/2.0
+android.frameworks.cameraservice.device@2.0.so frameworks/hardware/interfaces/cameraservice/device/2.0 frameworks/hardware/interfaces/cameraservice/device/2.0
+android.frameworks.cameraservice.service@2.0.so frameworks/hardware/interfaces/cameraservice/service/2.0 frameworks/hardware/interfaces/cameraservice/service/2.0
+android.frameworks.displayservice@1.0.so frameworks/hardware/interfaces/displayservice/1.0 frameworks/hardware/interfaces/displayservice/1.0
+android.frameworks.schedulerservice@1.0.so frameworks/hardware/interfaces/schedulerservice/1.0 frameworks/hardware/interfaces/schedulerservice/1.0
+android.frameworks.sensorservice@1.0.so frameworks/hardware/interfaces/sensorservice/1.0 frameworks/hardware/interfaces/sensorservice/1.0
+android.frameworks.stats@1.0.so frameworks/hardware/interfaces/stats/1.0 frameworks/hardware/interfaces/stats/1.0
+android.frameworks.vr.composer@1.0.so frameworks/hardware/interfaces/vr/composer/1.0 frameworks/hardware/interfaces/vr/composer/1.0
+android.hardware.atrace@1.0.so hardware/interfaces/atrace/1.0 hardware/interfaces/atrace/1.0
+android.hardware.audio.common@2.0.so hardware/interfaces/audio/common/2.0 hardware/interfaces/audio/common/2.0
+android.hardware.audio.common@4.0.so hardware/interfaces/audio/common/4.0 hardware/interfaces/audio/common/4.0
+android.hardware.audio.common@5.0.so hardware/interfaces/audio/common/5.0 hardware/interfaces/audio/common/5.0
+android.hardware.audio.effect@2.0.so hardware/interfaces/audio/effect/2.0 hardware/interfaces/audio/effect/2.0
+android.hardware.audio.effect@4.0.so hardware/interfaces/audio/effect/4.0 hardware/interfaces/audio/effect/4.0
+android.hardware.audio.effect@5.0.so hardware/interfaces/audio/effect/5.0 hardware/interfaces/audio/effect/5.0
+android.hardware.audio@2.0.so hardware/interfaces/audio/2.0 hardware/interfaces/audio/2.0
+android.hardware.audio@4.0.so hardware/interfaces/audio/4.0 hardware/interfaces/audio/4.0
+android.hardware.audio@5.0.so hardware/interfaces/audio/5.0 hardware/interfaces/audio/5.0
+android.hardware.authsecret@1.0.so hardware/interfaces/authsecret/1.0 hardware/interfaces/authsecret/1.0
+android.hardware.automotive.audiocontrol@1.0.so hardware/interfaces/automotive/audiocontrol/1.0 hardware/interfaces/automotive/audiocontrol/1.0
+android.hardware.automotive.evs@1.0.so hardware/interfaces/automotive/evs/1.0 hardware/interfaces/automotive/evs/1.0
+android.hardware.automotive.vehicle@2.0.so hardware/interfaces/automotive/vehicle/2.0 hardware/interfaces/automotive/vehicle/2.0
+android.hardware.biometrics.face@1.0.so hardware/interfaces/biometrics/face/1.0 hardware/interfaces/biometrics/face/1.0
+android.hardware.biometrics.fingerprint@2.1.so hardware/interfaces/biometrics/fingerprint/2.1 hardware/interfaces/biometrics/fingerprint/2.1
+android.hardware.bluetooth.a2dp@1.0.so hardware/interfaces/bluetooth/a2dp/1.0 hardware/interfaces/bluetooth/a2dp/1.0
+android.hardware.bluetooth.audio@2.0.so hardware/interfaces/bluetooth/audio/2.0 hardware/interfaces/bluetooth/audio/2.0
+android.hardware.bluetooth@1.0.so hardware/interfaces/bluetooth/1.0 hardware/interfaces/bluetooth/1.0
+android.hardware.boot@1.0.so hardware/interfaces/boot/1.0 hardware/interfaces/boot/1.0
+android.hardware.broadcastradio@1.0.so hardware/interfaces/broadcastradio/1.0 hardware/interfaces/broadcastradio/1.0
+android.hardware.broadcastradio@1.1.so hardware/interfaces/broadcastradio/1.1 hardware/interfaces/broadcastradio/1.1
+android.hardware.broadcastradio@2.0.so hardware/interfaces/broadcastradio/2.0 hardware/interfaces/broadcastradio/2.0
+android.hardware.camera.common@1.0.so hardware/interfaces/camera/common/1.0 hardware/interfaces/camera/common/1.0
+android.hardware.camera.device@1.0.so hardware/interfaces/camera/device/1.0 hardware/interfaces/camera/device/1.0
+android.hardware.camera.device@3.2.so hardware/interfaces/camera/device/3.2 hardware/interfaces/camera/device/3.2
+android.hardware.camera.device@3.3.so hardware/interfaces/camera/device/3.3 hardware/interfaces/camera/device/3.3
+android.hardware.camera.device@3.4.so hardware/interfaces/camera/device/3.4 hardware/interfaces/camera/device/3.4
+android.hardware.camera.device@3.5.so hardware/interfaces/camera/device/3.5 hardware/interfaces/camera/device/3.5
+android.hardware.camera.metadata@3.2.so hardware/interfaces/camera/metadata/3.2 hardware/interfaces/camera/metadata/3.2
+android.hardware.camera.metadata@3.3.so hardware/interfaces/camera/metadata/3.3 hardware/interfaces/camera/metadata/3.3
+android.hardware.camera.metadata@3.4.so hardware/interfaces/camera/metadata/3.4 hardware/interfaces/camera/metadata/3.4
+android.hardware.camera.provider@2.4.so hardware/interfaces/camera/provider/2.4 hardware/interfaces/camera/provider/2.4
+android.hardware.camera.provider@2.5.so hardware/interfaces/camera/provider/2.5 hardware/interfaces/camera/provider/2.5
+android.hardware.cas.native@1.0.so hardware/interfaces/cas/native/1.0 hardware/interfaces/cas/native/1.0
+android.hardware.cas@1.0.so hardware/interfaces/cas/1.0 hardware/interfaces/cas/1.0
+android.hardware.cas@1.1.so hardware/interfaces/cas/1.1 hardware/interfaces/cas/1.1
+android.hardware.configstore-utils.so hardware/interfaces/configstore/utils
+android.hardware.configstore@1.0.so hardware/interfaces/configstore/1.0 hardware/interfaces/configstore/1.0
+android.hardware.configstore@1.1.so hardware/interfaces/configstore/1.1 hardware/interfaces/configstore/1.1
+android.hardware.confirmationui-support-lib.so hardware/interfaces/confirmationui/support hardware/interfaces/confirmationui/support
+android.hardware.confirmationui@1.0.so hardware/interfaces/confirmationui/1.0 hardware/interfaces/confirmationui/1.0
+android.hardware.contexthub@1.0.so hardware/interfaces/contexthub/1.0 hardware/interfaces/contexthub/1.0
+android.hardware.drm@1.0.so hardware/interfaces/drm/1.0 hardware/interfaces/drm/1.0
+android.hardware.drm@1.1.so hardware/interfaces/drm/1.1 hardware/interfaces/drm/1.1
+android.hardware.drm@1.2.so hardware/interfaces/drm/1.2 hardware/interfaces/drm/1.2
+android.hardware.dumpstate@1.0.so hardware/interfaces/dumpstate/1.0 hardware/interfaces/dumpstate/1.0
+android.hardware.fastboot@1.0.so hardware/interfaces/fastboot/1.0 hardware/interfaces/fastboot/1.0
+android.hardware.gatekeeper@1.0.so hardware/interfaces/gatekeeper/1.0 hardware/interfaces/gatekeeper/1.0
+android.hardware.gnss.measurement_corrections@1.0.so hardware/interfaces/gnss/measurement_corrections/1.0 hardware/interfaces/gnss/measurement_corrections/1.0
+android.hardware.gnss.visibility_control@1.0.so hardware/interfaces/gnss/visibility_control/1.0 hardware/interfaces/gnss/visibility_control/1.0
+android.hardware.gnss@1.0.so hardware/interfaces/gnss/1.0 hardware/interfaces/gnss/1.0
+android.hardware.gnss@1.1.so hardware/interfaces/gnss/1.1 hardware/interfaces/gnss/1.1
+android.hardware.gnss@2.0.so hardware/interfaces/gnss/2.0 hardware/interfaces/gnss/2.0
+android.hardware.graphics.allocator@2.0.so hardware/interfaces/graphics/allocator/2.0 hardware/interfaces/graphics/allocator/2.0
+android.hardware.graphics.allocator@3.0.so hardware/interfaces/graphics/allocator/3.0 hardware/interfaces/graphics/allocator/3.0
+android.hardware.graphics.bufferqueue@1.0.so hardware/interfaces/graphics/bufferqueue/1.0 hardware/interfaces/graphics/bufferqueue/1.0
+android.hardware.graphics.bufferqueue@2.0.so hardware/interfaces/graphics/bufferqueue/2.0 hardware/interfaces/graphics/bufferqueue/2.0
+android.hardware.graphics.composer@2.1.so hardware/interfaces/graphics/composer/2.1 hardware/interfaces/graphics/composer/2.1
+android.hardware.graphics.composer@2.2.so hardware/interfaces/graphics/composer/2.2 hardware/interfaces/graphics/composer/2.2
+android.hardware.graphics.composer@2.3.so hardware/interfaces/graphics/composer/2.3 hardware/interfaces/graphics/composer/2.3
+android.hardware.health.storage@1.0.so hardware/interfaces/health/storage/1.0 hardware/interfaces/health/storage/1.0
+android.hardware.health@1.0.so hardware/interfaces/health/1.0 hardware/interfaces/health/1.0
+android.hardware.health@2.0.so hardware/interfaces/health/2.0 hardware/interfaces/health/2.0
+android.hardware.input.classifier@1.0.so hardware/interfaces/input/classifier/1.0 hardware/interfaces/input/classifier/1.0
+android.hardware.input.common@1.0.so hardware/interfaces/input/common/1.0 hardware/interfaces/input/common/1.0
+android.hardware.ir@1.0.so hardware/interfaces/ir/1.0 hardware/interfaces/ir/1.0
+android.hardware.keymaster@3.0.so hardware/interfaces/keymaster/3.0 hardware/interfaces/keymaster/3.0
+android.hardware.keymaster@4.0.so hardware/interfaces/keymaster/4.0 hardware/interfaces/keymaster/4.0
+android.hardware.light@2.0.so hardware/interfaces/light/2.0 hardware/interfaces/light/2.0
+android.hardware.media.bufferpool@1.0.so hardware/interfaces/media/bufferpool/1.0 hardware/interfaces/media/bufferpool/1.0
+android.hardware.media.bufferpool@2.0.so hardware/interfaces/media/bufferpool/2.0 hardware/interfaces/media/bufferpool/2.0
+android.hardware.media.c2@1.0.so hardware/interfaces/media/c2/1.0 hardware/interfaces/media/c2/1.0
+android.hardware.media.omx@1.0.so hardware/interfaces/media/omx/1.0 hardware/interfaces/media/omx/1.0
+android.hardware.media@1.0.so hardware/interfaces/media/1.0 hardware/interfaces/media/1.0
+android.hardware.memtrack@1.0.so hardware/interfaces/memtrack/1.0 hardware/interfaces/memtrack/1.0
+android.hardware.neuralnetworks@1.0.so hardware/interfaces/neuralnetworks/1.0 hardware/interfaces/neuralnetworks/1.0
+android.hardware.neuralnetworks@1.1.so hardware/interfaces/neuralnetworks/1.1 hardware/interfaces/neuralnetworks/1.1
+android.hardware.neuralnetworks@1.2.so hardware/interfaces/neuralnetworks/1.2 hardware/interfaces/neuralnetworks/1.2
+android.hardware.nfc@1.0.so hardware/interfaces/nfc/1.0 hardware/interfaces/nfc/1.0
+android.hardware.nfc@1.1.so hardware/interfaces/nfc/1.1 hardware/interfaces/nfc/1.1
+android.hardware.nfc@1.2.so hardware/interfaces/nfc/1.2 hardware/interfaces/nfc/1.2
+android.hardware.oemlock@1.0.so hardware/interfaces/oemlock/1.0 hardware/interfaces/oemlock/1.0
+android.hardware.power.stats@1.0.so hardware/interfaces/power/stats/1.0 hardware/interfaces/power/stats/1.0
+android.hardware.power@1.0.so hardware/interfaces/power/1.0 hardware/interfaces/power/1.0
+android.hardware.power@1.1.so hardware/interfaces/power/1.1 hardware/interfaces/power/1.1
+android.hardware.power@1.2.so hardware/interfaces/power/1.2 hardware/interfaces/power/1.2
+android.hardware.power@1.3.so hardware/interfaces/power/1.3 hardware/interfaces/power/1.3
+android.hardware.radio.config@1.0.so hardware/interfaces/radio/config/1.0 hardware/interfaces/radio/config/1.0
+android.hardware.radio.config@1.1.so hardware/interfaces/radio/config/1.1 hardware/interfaces/radio/config/1.1
+android.hardware.radio.config@1.2.so hardware/interfaces/radio/config/1.2 hardware/interfaces/radio/config/1.2
+android.hardware.radio.deprecated@1.0.so hardware/interfaces/radio/deprecated/1.0 hardware/interfaces/radio/deprecated/1.0
+android.hardware.radio@1.0.so hardware/interfaces/radio/1.0 hardware/interfaces/radio/1.0
+android.hardware.radio@1.1.so hardware/interfaces/radio/1.1 hardware/interfaces/radio/1.1
+android.hardware.radio@1.2.so hardware/interfaces/radio/1.2 hardware/interfaces/radio/1.2
+android.hardware.radio@1.3.so hardware/interfaces/radio/1.3 hardware/interfaces/radio/1.3
+android.hardware.radio@1.4.so hardware/interfaces/radio/1.4 hardware/interfaces/radio/1.4
+android.hardware.secure_element@1.0.so hardware/interfaces/secure_element/1.0 hardware/interfaces/secure_element/1.0
+android.hardware.secure_element@1.1.so hardware/interfaces/secure_element/1.1 hardware/interfaces/secure_element/1.1
+android.hardware.sensors@1.0.so hardware/interfaces/sensors/1.0 hardware/interfaces/sensors/1.0
+android.hardware.sensors@2.0.so hardware/interfaces/sensors/2.0 hardware/interfaces/sensors/2.0
+android.hardware.soundtrigger@2.0.so hardware/interfaces/soundtrigger/2.0 hardware/interfaces/soundtrigger/2.0
+android.hardware.soundtrigger@2.0-core.so hardware/interfaces/soundtrigger/2.0/default
+android.hardware.soundtrigger@2.1.so hardware/interfaces/soundtrigger/2.1 hardware/interfaces/soundtrigger/2.1
+android.hardware.soundtrigger@2.2.so hardware/interfaces/soundtrigger/2.2 hardware/interfaces/soundtrigger/2.2
+android.hardware.tetheroffload.config@1.0.so hardware/interfaces/tetheroffload/config/1.0 hardware/interfaces/tetheroffload/config/1.0
+android.hardware.tetheroffload.control@1.0.so hardware/interfaces/tetheroffload/control/1.0 hardware/interfaces/tetheroffload/control/1.0
+android.hardware.thermal@1.0.so hardware/interfaces/thermal/1.0 hardware/interfaces/thermal/1.0
+android.hardware.thermal@1.1.so hardware/interfaces/thermal/1.1 hardware/interfaces/thermal/1.1
+android.hardware.thermal@2.0.so hardware/interfaces/thermal/2.0 hardware/interfaces/thermal/2.0
+android.hardware.tv.cec@1.0.so hardware/interfaces/tv/cec/1.0 hardware/interfaces/tv/cec/1.0
+android.hardware.tv.cec@2.0.so hardware/interfaces/tv/cec/2.0 hardware/interfaces/tv/cec/2.0
+android.hardware.tv.input@1.0.so hardware/interfaces/tv/input/1.0 hardware/interfaces/tv/input/1.0
+android.hardware.usb.gadget@1.0.so hardware/interfaces/usb/gadget/1.0 hardware/interfaces/usb/gadget/1.0
+android.hardware.usb@1.0.so hardware/interfaces/usb/1.0 hardware/interfaces/usb/1.0
+android.hardware.usb@1.1.so hardware/interfaces/usb/1.1 hardware/interfaces/usb/1.1
+android.hardware.usb@1.2.so hardware/interfaces/usb/1.2 hardware/interfaces/usb/1.2
+android.hardware.vibrator@1.0.so hardware/interfaces/vibrator/1.0 hardware/interfaces/vibrator/1.0
+android.hardware.vibrator@1.1.so hardware/interfaces/vibrator/1.1 hardware/interfaces/vibrator/1.1
+android.hardware.vibrator@1.2.so hardware/interfaces/vibrator/1.2 hardware/interfaces/vibrator/1.2
+android.hardware.vibrator@1.3.so hardware/interfaces/vibrator/1.3 hardware/interfaces/vibrator/1.3
+android.hardware.vr@1.0.so hardware/interfaces/vr/1.0 hardware/interfaces/vr/1.0
+android.hardware.weaver@1.0.so hardware/interfaces/weaver/1.0 hardware/interfaces/weaver/1.0
+android.hardware.wifi.hostapd@1.0.so hardware/interfaces/wifi/hostapd/1.0 hardware/interfaces/wifi/hostapd/1.0
+android.hardware.wifi.hostapd@1.1.so hardware/interfaces/wifi/hostapd/1.1 hardware/interfaces/wifi/hostapd/1.1
+android.hardware.wifi.offload@1.0.so hardware/interfaces/wifi/offload/1.0 hardware/interfaces/wifi/offload/1.0
+android.hardware.wifi.supplicant@1.0.so hardware/interfaces/wifi/supplicant/1.0 hardware/interfaces/wifi/supplicant/1.0
+android.hardware.wifi.supplicant@1.1.so hardware/interfaces/wifi/supplicant/1.1 hardware/interfaces/wifi/supplicant/1.1
+android.hardware.wifi.supplicant@1.2.so hardware/interfaces/wifi/supplicant/1.2 hardware/interfaces/wifi/supplicant/1.2
+android.hardware.wifi@1.0.so hardware/interfaces/wifi/1.0 hardware/interfaces/wifi/1.0
+android.hardware.wifi@1.1.so hardware/interfaces/wifi/1.1 hardware/interfaces/wifi/1.1
+android.hardware.wifi@1.2.so hardware/interfaces/wifi/1.2 hardware/interfaces/wifi/1.2
+android.hardware.wifi@1.3.so hardware/interfaces/wifi/1.3 hardware/interfaces/wifi/1.3
+android.hidl.allocator@1.0.so system/libhidl/transport/allocator/1.0 system/libhidl/transport/allocator/1.0
+android.hidl.memory.block@1.0.so system/libhidl/transport/memory/block/1.0 system/libhidl/transport/memory/block/1.0
+android.hidl.token@1.0.so system/libhidl/transport/token/1.0 system/libhidl/transport/token/1.0
+android.hidl.token@1.0-utils.so system/libhidl/transport/token/1.0/utils system/libhidl/transport/token/1.0/utils
+android.system.net.netd@1.0.so system/hardware/interfaces/net/netd/1.0 system/hardware/interfaces/net/netd/1.0
+android.system.net.netd@1.1.so system/hardware/interfaces/net/netd/1.1 system/hardware/interfaces/net/netd/1.1
+android.system.suspend@1.0.so system/hardware/interfaces/suspend/1.0 system/hardware/interfaces/suspend/1.0
+android.system.wifi.keystore@1.0.so system/hardware/interfaces/wifi/keystore/1.0 system/hardware/interfaces/wifi/keystore/1.0
+libadf.so system/core/deprecated-adf/libadf system/core/deprecated-adf/libadf
+libaudioroute.so system/media/audio_route
+libaudioutils.so system/media/audio_utils system/media/audio_utils
+libbinder.so frameworks/native/libs/binder
+libcamera_metadata.so system/media/camera
+libcap.so external/libcap external/libcap
+libclang_rt.scudo-arm-android.so prebuilts/clang/host/linux-x86
+libclang_rt.scudo_minimal-arm-android.so prebuilts/clang/host/linux-x86
+libclang_rt.ubsan_minimal-arm-android.so prebuilts/clang/host/linux-x86
+libclang_rt.ubsan_standalone-arm-android.so prebuilts/clang/host/linux-x86
+libcn-cbor.so external/cn-cbor external/cn-cbor
+libcodec2.so frameworks/av/media/codec2/core
+libcrypto.so external/boringssl external/boringssl
+libcrypto_utils.so system/core/libcrypto_utils system/core/libcrypto_utils
+libcurl.so external/curl external/curl
+libdiskconfig.so system/core/libdiskconfig system/core/libdiskconfig
+libdumpstateutil.so frameworks/native/cmds/dumpstate
+libevent.so external/libevent external/libevent
+libexif.so external/libexif
+libexpat.so external/expat external/expat
+libfmq.so system/libfmq system/libfmq
+libgatekeeper.so system/gatekeeper
+libgui.so frameworks/native/libs/gui
+libhardware_legacy.so hardware/libhardware_legacy
+libhidlallocatorutils.so system/libhidl/transport/allocator/1.0/utils system/libhidl/transport/allocator/1.0/utils
+libhidlcache.so system/libhidl/libhidlcache system/libhidl/libhidlcache
+libjpeg.so external/libjpeg-turbo external/libjpeg-turbo
+libkeymaster_messages.so system/keymaster
+libkeymaster_portable.so system/keymaster system/keymaster
+libldacBT_abr.so external/libldac
+libldacBT_enc.so external/libldac
+liblz4.so external/lz4/lib external/lz4/lib
+libmedia_helper.so frameworks/av/media/libmedia frameworks/av/media/libmedia
+libmedia_omx.so frameworks/av/media/libmedia
+libmemtrack.so system/core/libmemtrack
+libminijail.so external/minijail external/minijail
+libmkbootimg_abi_check.so system/core/mkbootimg system/core/mkbootimg
+libnetutils.so system/core/libnetutils
+libnl.so external/libnl external/libnl
+libpcre2.so external/pcre external/pcre
+libpiex.so external/piex
+libpng.so external/libpng external/libpng
+libpower.so hardware/libhardware_legacy hardware/libhardware_legacy
+libprocinfo.so system/core/libprocinfo system/core/libprocinfo
+libprotobuf-cpp-full.so external/protobuf
+libprotobuf-cpp-lite.so external/protobuf external/protobuf
+libpuresoftkeymasterdevice.so system/keymaster system/keymaster
+libradio_metadata.so system/media/radio
+libselinux.so external/selinux/libselinux external/selinux/libselinux
+libsoftkeymasterdevice.so system/keymaster system/keymaster
+libspeexresampler.so external/speex
+libsqlite.so external/sqlite/dist external/sqlite/dist
+libssl.so external/boringssl external/boringssl
+libstagefright_bufferpool@2.0.so frameworks/av/media/bufferpool/2.0 frameworks/av/media/bufferpool/2.0
+libstagefright_bufferqueue_helper.so frameworks/av/media/libstagefright/bqhelper
+libstagefright_foundation.so frameworks/av/media/libstagefright/foundation frameworks/av/media/libstagefright/foundation
+libstagefright_omx.so frameworks/av/media/libstagefright/omx
+libstagefright_omx_utils.so frameworks/av/media/libstagefright/omx
+libstagefright_xmlparser.so frameworks/av/media/libstagefright/xmlparser
+libsysutils.so system/core/libsysutils system/core/libsysutils
+libtinyalsa.so external/tinyalsa external/tinyalsa
+libtinyxml2.so external/tinyxml2 external/tinyxml2
+libui.so frameworks/native/libs/ui
+libusbhost.so system/core/libusbhost system/core/libusbhost
+libwifi-system-iface.so frameworks/opt/net/wifi/libwifi_system_iface frameworks/opt/net/wifi/libwifi_system_iface
+libxml2.so external/libxml2 external/libxml2
+libyuv.so external/libyuv/files external/libyuv/files
+libziparchive.so system/core/libziparchive system/core/libziparchive
+android.hardware.graphics.common@1.0.so hardware/interfaces/graphics/common/1.0 hardware/interfaces/graphics/common/1.0
+android.hardware.graphics.common@1.1.so hardware/interfaces/graphics/common/1.1 hardware/interfaces/graphics/common/1.1
+android.hardware.graphics.common@1.2.so hardware/interfaces/graphics/common/1.2 hardware/interfaces/graphics/common/1.2
+android.hardware.graphics.mapper@2.0.so hardware/interfaces/graphics/mapper/2.0 hardware/interfaces/graphics/mapper/2.0
+android.hardware.graphics.mapper@2.1.so hardware/interfaces/graphics/mapper/2.1 hardware/interfaces/graphics/mapper/2.1
+android.hardware.graphics.mapper@3.0.so hardware/interfaces/graphics/mapper/3.0 hardware/interfaces/graphics/mapper/3.0
+android.hardware.renderscript@1.0.so hardware/interfaces/renderscript/1.0 hardware/interfaces/renderscript/1.0
+android.hidl.memory.token@1.0.so system/libhidl/transport/memory/token/1.0 system/libhidl/transport/memory/token/1.0
+android.hidl.memory@1.0.so system/libhidl/transport/memory/1.0 system/libhidl/transport/memory/1.0
+android.hidl.memory@1.0-impl.so system/libhidl/transport/memory/1.0/default
+android.hidl.safe_union@1.0.so system/libhidl/transport/safe_union/1.0 system/libhidl/transport/safe_union/1.0
+libRSCpuRef.so frameworks/rs/cpu_ref
+libRSDriver.so frameworks/rs
+libRS_internal.so frameworks/rs
+libbacktrace.so system/core/libbacktrace system/core/libbacktrace
+libbase.so system/core/base system/core/base
+libbcinfo.so frameworks/compile/libbcc/bcinfo
+libbinderthreadstate.so frameworks/native/libs/binderthreadstate frameworks/native/libs/binderthreadstate
+libblas.so external/cblas
+libc++.so external/libcxx
+libcompiler_rt.so external/compiler-rt external/compiler-rt
+libcutils.so system/core/libcutils system/core/libcutils
+libhardware.so hardware/libhardware
+libhidlbase.so system/libhidl system/libhidl
+libhidlmemory.so system/libhidl/libhidlmemory system/libhidl/libhidlmemory
+libhidltransport.so system/libhidl system/libhidl
+libhwbinder.so system/libhwbinder system/libhwbinder
+libhwbinder_noltopgo.so system/libhwbinder system/libhwbinder
+libion.so system/core/libion system/core/libion
+libjsoncpp.so external/jsoncpp external/jsoncpp
+liblzma.so external/lzma/C external/lzma/C
+libprocessgroup.so system/core/libprocessgroup system/core/libprocessgroup
+libunwindstack.so system/core/libunwindstack system/core/libunwindstack
+libutils.so system/core/libutils system/core/libutils
+libutilscallstack.so system/core/libutils system/core/libutils
+libz.so external/zlib external/zlib
diff --git a/arm/configs/vndkcore.libraries.txt b/arm/configs/vndkcore.libraries.txt
new file mode 100644
index 0000000..7a1ef7c
--- /dev/null
+++ b/arm/configs/vndkcore.libraries.txt
@@ -0,0 +1,217 @@
+android.frameworks.cameraservice.common@2.0.so
+android.frameworks.cameraservice.device@2.0.so
+android.frameworks.cameraservice.service@2.0.so
+android.frameworks.displayservice@1.0.so
+android.frameworks.schedulerservice@1.0.so
+android.frameworks.sensorservice@1.0.so
+android.frameworks.stats@1.0.so
+android.frameworks.vr.composer@1.0.so
+android.hardware.atrace@1.0.so
+android.hardware.audio.common@2.0.so
+android.hardware.audio.common@4.0.so
+android.hardware.audio.common@5.0.so
+android.hardware.audio.effect@2.0.so
+android.hardware.audio.effect@4.0.so
+android.hardware.audio.effect@5.0.so
+android.hardware.audio@2.0.so
+android.hardware.audio@4.0.so
+android.hardware.audio@5.0.so
+android.hardware.authsecret@1.0.so
+android.hardware.automotive.audiocontrol@1.0.so
+android.hardware.automotive.evs@1.0.so
+android.hardware.automotive.vehicle@2.0.so
+android.hardware.biometrics.face@1.0.so
+android.hardware.biometrics.fingerprint@2.1.so
+android.hardware.bluetooth.a2dp@1.0.so
+android.hardware.bluetooth.audio@2.0.so
+android.hardware.bluetooth@1.0.so
+android.hardware.boot@1.0.so
+android.hardware.broadcastradio@1.0.so
+android.hardware.broadcastradio@1.1.so
+android.hardware.broadcastradio@2.0.so
+android.hardware.camera.common@1.0.so
+android.hardware.camera.device@1.0.so
+android.hardware.camera.device@3.2.so
+android.hardware.camera.device@3.3.so
+android.hardware.camera.device@3.4.so
+android.hardware.camera.device@3.5.so
+android.hardware.camera.metadata@3.2.so
+android.hardware.camera.metadata@3.3.so
+android.hardware.camera.metadata@3.4.so
+android.hardware.camera.provider@2.4.so
+android.hardware.camera.provider@2.5.so
+android.hardware.cas.native@1.0.so
+android.hardware.cas@1.0.so
+android.hardware.cas@1.1.so
+android.hardware.configstore-utils.so
+android.hardware.configstore@1.0.so
+android.hardware.configstore@1.1.so
+android.hardware.confirmationui-support-lib.so
+android.hardware.confirmationui@1.0.so
+android.hardware.contexthub@1.0.so
+android.hardware.drm@1.0.so
+android.hardware.drm@1.1.so
+android.hardware.drm@1.2.so
+android.hardware.dumpstate@1.0.so
+android.hardware.fastboot@1.0.so
+android.hardware.gatekeeper@1.0.so
+android.hardware.gnss.measurement_corrections@1.0.so
+android.hardware.gnss.visibility_control@1.0.so
+android.hardware.gnss@1.0.so
+android.hardware.gnss@1.1.so
+android.hardware.gnss@2.0.so
+android.hardware.graphics.allocator@2.0.so
+android.hardware.graphics.allocator@3.0.so
+android.hardware.graphics.bufferqueue@1.0.so
+android.hardware.graphics.bufferqueue@2.0.so
+android.hardware.graphics.composer@2.1.so
+android.hardware.graphics.composer@2.2.so
+android.hardware.graphics.composer@2.3.so
+android.hardware.health.storage@1.0.so
+android.hardware.health@1.0.so
+android.hardware.health@2.0.so
+android.hardware.input.classifier@1.0.so
+android.hardware.input.common@1.0.so
+android.hardware.ir@1.0.so
+android.hardware.keymaster@3.0.so
+android.hardware.keymaster@4.0.so
+android.hardware.light@2.0.so
+android.hardware.media.bufferpool@1.0.so
+android.hardware.media.bufferpool@2.0.so
+android.hardware.media.c2@1.0.so
+android.hardware.media.omx@1.0.so
+android.hardware.media@1.0.so
+android.hardware.memtrack@1.0.so
+android.hardware.neuralnetworks@1.0.so
+android.hardware.neuralnetworks@1.1.so
+android.hardware.neuralnetworks@1.2.so
+android.hardware.nfc@1.0.so
+android.hardware.nfc@1.1.so
+android.hardware.nfc@1.2.so
+android.hardware.oemlock@1.0.so
+android.hardware.power.stats@1.0.so
+android.hardware.power@1.0.so
+android.hardware.power@1.1.so
+android.hardware.power@1.2.so
+android.hardware.power@1.3.so
+android.hardware.radio.config@1.0.so
+android.hardware.radio.config@1.1.so
+android.hardware.radio.config@1.2.so
+android.hardware.radio.deprecated@1.0.so
+android.hardware.radio@1.0.so
+android.hardware.radio@1.1.so
+android.hardware.radio@1.2.so
+android.hardware.radio@1.3.so
+android.hardware.radio@1.4.so
+android.hardware.secure_element@1.0.so
+android.hardware.secure_element@1.1.so
+android.hardware.sensors@1.0.so
+android.hardware.sensors@2.0.so
+android.hardware.soundtrigger@2.0.so
+android.hardware.soundtrigger@2.0-core.so
+android.hardware.soundtrigger@2.1.so
+android.hardware.soundtrigger@2.2.so
+android.hardware.tetheroffload.config@1.0.so
+android.hardware.tetheroffload.control@1.0.so
+android.hardware.thermal@1.0.so
+android.hardware.thermal@1.1.so
+android.hardware.thermal@2.0.so
+android.hardware.tv.cec@1.0.so
+android.hardware.tv.cec@2.0.so
+android.hardware.tv.input@1.0.so
+android.hardware.usb.gadget@1.0.so
+android.hardware.usb@1.0.so
+android.hardware.usb@1.1.so
+android.hardware.usb@1.2.so
+android.hardware.vibrator@1.0.so
+android.hardware.vibrator@1.1.so
+android.hardware.vibrator@1.2.so
+android.hardware.vibrator@1.3.so
+android.hardware.vr@1.0.so
+android.hardware.weaver@1.0.so
+android.hardware.wifi.hostapd@1.0.so
+android.hardware.wifi.hostapd@1.1.so
+android.hardware.wifi.offload@1.0.so
+android.hardware.wifi.supplicant@1.0.so
+android.hardware.wifi.supplicant@1.1.so
+android.hardware.wifi.supplicant@1.2.so
+android.hardware.wifi@1.0.so
+android.hardware.wifi@1.1.so
+android.hardware.wifi@1.2.so
+android.hardware.wifi@1.3.so
+android.hidl.allocator@1.0.so
+android.hidl.memory.block@1.0.so
+android.hidl.token@1.0.so
+android.hidl.token@1.0-utils.so
+android.system.net.netd@1.0.so
+android.system.net.netd@1.1.so
+android.system.suspend@1.0.so
+android.system.wifi.keystore@1.0.so
+libadf.so
+libaudioroute.so
+libaudioutils.so
+libbinder.so
+libcamera_metadata.so
+libcap.so
+libclang_rt.scudo-arm-android.so
+libclang_rt.scudo_minimal-arm-android.so
+libclang_rt.ubsan_minimal-arm-android.so
+libclang_rt.ubsan_standalone-arm-android.so
+libcn-cbor.so
+libcodec2.so
+libcrypto.so
+libcrypto_utils.so
+libcurl.so
+libdiskconfig.so
+libdumpstateutil.so
+libevent.so
+libexif.so
+libexpat.so
+libfmq.so
+libgatekeeper.so
+libgui.so
+libhardware_legacy.so
+libhidlallocatorutils.so
+libhidlcache.so
+libjpeg.so
+libkeymaster_messages.so
+libkeymaster_portable.so
+libldacBT_abr.so
+libldacBT_enc.so
+liblz4.so
+libmedia_helper.so
+libmedia_omx.so
+libmemtrack.so
+libminijail.so
+libmkbootimg_abi_check.so
+libnetutils.so
+libnl.so
+libpcre2.so
+libpiex.so
+libpng.so
+libpower.so
+libprocinfo.so
+libprotobuf-cpp-full.so
+libprotobuf-cpp-lite.so
+libpuresoftkeymasterdevice.so
+libradio_metadata.so
+libselinux.so
+libsoftkeymasterdevice.so
+libspeexresampler.so
+libsqlite.so
+libssl.so
+libstagefright_bufferpool@2.0.so
+libstagefright_bufferqueue_helper.so
+libstagefright_foundation.so
+libstagefright_omx.so
+libstagefright_omx_utils.so
+libstagefright_xmlparser.so
+libsysutils.so
+libtinyalsa.so
+libtinyxml2.so
+libui.so
+libusbhost.so
+libwifi-system-iface.so
+libxml2.so
+libyuv.so
+libziparchive.so
diff --git a/arm/configs/vndkprivate.libraries.txt b/arm/configs/vndkprivate.libraries.txt
new file mode 100644
index 0000000..affe770
--- /dev/null
+++ b/arm/configs/vndkprivate.libraries.txt
@@ -0,0 +1,6 @@
+libbacktrace.so
+libbinderthreadstate.so
+libblas.so
+libcompiler_rt.so
+libft2.so
+libgui.so
diff --git a/arm/configs/vndksp.libraries.29.txt b/arm/configs/vndksp.libraries.29.txt
new file mode 100644
index 0000000..9698533
--- /dev/null
+++ b/arm/configs/vndksp.libraries.29.txt
@@ -0,0 +1,36 @@
+android.hardware.graphics.common@1.0.so
+android.hardware.graphics.common@1.1.so
+android.hardware.graphics.common@1.2.so
+android.hardware.graphics.mapper@2.0.so
+android.hardware.graphics.mapper@2.1.so
+android.hardware.graphics.mapper@3.0.so
+android.hardware.renderscript@1.0.so
+android.hidl.memory.token@1.0.so
+android.hidl.memory@1.0.so
+android.hidl.memory@1.0-impl.so
+android.hidl.safe_union@1.0.so
+libRSCpuRef.so
+libRSDriver.so
+libRS_internal.so
+libbacktrace.so
+libbase.so
+libbcinfo.so
+libbinderthreadstate.so
+libblas.so
+libc++.so
+libcompiler_rt.so
+libcutils.so
+libhardware.so
+libhidlbase.so
+libhidlmemory.so
+libhidltransport.so
+libhwbinder.so
+libhwbinder_noltopgo.so
+libion.so
+libjsoncpp.so
+liblzma.so
+libprocessgroup.so
+libunwindstack.so
+libutils.so
+libutilscallstack.so
+libz.so
diff --git a/arm64/Android.bp b/arm64/Android.bp
new file mode 100644
index 0000000..771d2e1
--- /dev/null
+++ b/arm64/Android.bp
@@ -0,0 +1,4946 @@
+// THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
+// DO NOT EDIT
+
+phony {
+    name: "vndk_v29_arm64",
+    required: [
+        "android.frameworks.cameraservice.common@2.0.vndk.29.arm64.vendor",
+        "android.frameworks.cameraservice.device@2.0.vndk.29.arm64.vendor",
+        "android.frameworks.cameraservice.service@2.0.vndk.29.arm64.vendor",
+        "android.frameworks.displayservice@1.0.vndk.29.arm64.vendor",
+        "android.frameworks.schedulerservice@1.0.vndk.29.arm64.vendor",
+        "android.frameworks.sensorservice@1.0.vndk.29.arm64.vendor",
+        "android.frameworks.stats@1.0.vndk.29.arm64.vendor",
+        "android.frameworks.vr.composer@1.0.vndk.29.arm64.vendor",
+        "android.hardware.atrace@1.0.vndk.29.arm64.vendor",
+        "android.hardware.audio.common@2.0.vndk.29.arm64.vendor",
+        "android.hardware.audio.common@4.0.vndk.29.arm64.vendor",
+        "android.hardware.audio.common@5.0.vndk.29.arm64.vendor",
+        "android.hardware.audio.effect@2.0.vndk.29.arm64.vendor",
+        "android.hardware.audio.effect@4.0.vndk.29.arm64.vendor",
+        "android.hardware.audio.effect@5.0.vndk.29.arm64.vendor",
+        "android.hardware.audio@2.0.vndk.29.arm64.vendor",
+        "android.hardware.audio@4.0.vndk.29.arm64.vendor",
+        "android.hardware.audio@5.0.vndk.29.arm64.vendor",
+        "android.hardware.authsecret@1.0.vndk.29.arm64.vendor",
+        "android.hardware.automotive.audiocontrol@1.0.vndk.29.arm64.vendor",
+        "android.hardware.automotive.evs@1.0.vndk.29.arm64.vendor",
+        "android.hardware.automotive.vehicle@2.0.vndk.29.arm64.vendor",
+        "android.hardware.biometrics.face@1.0.vndk.29.arm64.vendor",
+        "android.hardware.biometrics.fingerprint@2.1.vndk.29.arm64.vendor",
+        "android.hardware.bluetooth.a2dp@1.0.vndk.29.arm64.vendor",
+        "android.hardware.bluetooth.audio@2.0.vndk.29.arm64.vendor",
+        "android.hardware.bluetooth@1.0.vndk.29.arm64.vendor",
+        "android.hardware.boot@1.0.vndk.29.arm64.vendor",
+        "android.hardware.broadcastradio@1.0.vndk.29.arm64.vendor",
+        "android.hardware.broadcastradio@1.1.vndk.29.arm64.vendor",
+        "android.hardware.broadcastradio@2.0.vndk.29.arm64.vendor",
+        "android.hardware.camera.common@1.0.vndk.29.arm64.vendor",
+        "android.hardware.camera.device@1.0.vndk.29.arm64.vendor",
+        "android.hardware.camera.device@3.2.vndk.29.arm64.vendor",
+        "android.hardware.camera.device@3.3.vndk.29.arm64.vendor",
+        "android.hardware.camera.device@3.4.vndk.29.arm64.vendor",
+        "android.hardware.camera.device@3.5.vndk.29.arm64.vendor",
+        "android.hardware.camera.metadata@3.2.vndk.29.arm64.vendor",
+        "android.hardware.camera.metadata@3.3.vndk.29.arm64.vendor",
+        "android.hardware.camera.metadata@3.4.vndk.29.arm64.vendor",
+        "android.hardware.camera.provider@2.4.vndk.29.arm64.vendor",
+        "android.hardware.camera.provider@2.5.vndk.29.arm64.vendor",
+        "android.hardware.cas.native@1.0.vndk.29.arm64.vendor",
+        "android.hardware.cas@1.0.vndk.29.arm64.vendor",
+        "android.hardware.cas@1.1.vndk.29.arm64.vendor",
+        "android.hardware.configstore-utils.vndk.29.arm64.vendor",
+        "android.hardware.configstore@1.0.vndk.29.arm64.vendor",
+        "android.hardware.configstore@1.1.vndk.29.arm64.vendor",
+        "android.hardware.confirmationui-support-lib.vndk.29.arm64.vendor",
+        "android.hardware.confirmationui@1.0.vndk.29.arm64.vendor",
+        "android.hardware.contexthub@1.0.vndk.29.arm64.vendor",
+        "android.hardware.drm@1.0.vndk.29.arm64.vendor",
+        "android.hardware.drm@1.1.vndk.29.arm64.vendor",
+        "android.hardware.drm@1.2.vndk.29.arm64.vendor",
+        "android.hardware.dumpstate@1.0.vndk.29.arm64.vendor",
+        "android.hardware.fastboot@1.0.vndk.29.arm64.vendor",
+        "android.hardware.gatekeeper@1.0.vndk.29.arm64.vendor",
+        "android.hardware.gnss.measurement_corrections@1.0.vndk.29.arm64.vendor",
+        "android.hardware.gnss.visibility_control@1.0.vndk.29.arm64.vendor",
+        "android.hardware.gnss@1.0.vndk.29.arm64.vendor",
+        "android.hardware.gnss@1.1.vndk.29.arm64.vendor",
+        "android.hardware.gnss@2.0.vndk.29.arm64.vendor",
+        "android.hardware.graphics.allocator@2.0.vndk.29.arm64.vendor",
+        "android.hardware.graphics.allocator@3.0.vndk.29.arm64.vendor",
+        "android.hardware.graphics.bufferqueue@1.0.vndk.29.arm64.vendor",
+        "android.hardware.graphics.bufferqueue@2.0.vndk.29.arm64.vendor",
+        "android.hardware.graphics.composer@2.1.vndk.29.arm64.vendor",
+        "android.hardware.graphics.composer@2.2.vndk.29.arm64.vendor",
+        "android.hardware.graphics.composer@2.3.vndk.29.arm64.vendor",
+        "android.hardware.health.storage@1.0.vndk.29.arm64.vendor",
+        "android.hardware.health@1.0.vndk.29.arm64.vendor",
+        "android.hardware.health@2.0.vndk.29.arm64.vendor",
+        "android.hardware.input.classifier@1.0.vndk.29.arm64.vendor",
+        "android.hardware.input.common@1.0.vndk.29.arm64.vendor",
+        "android.hardware.ir@1.0.vndk.29.arm64.vendor",
+        "android.hardware.keymaster@3.0.vndk.29.arm64.vendor",
+        "android.hardware.keymaster@4.0.vndk.29.arm64.vendor",
+        "android.hardware.light@2.0.vndk.29.arm64.vendor",
+        "android.hardware.media.bufferpool@1.0.vndk.29.arm64.vendor",
+        "android.hardware.media.bufferpool@2.0.vndk.29.arm64.vendor",
+        "android.hardware.media.c2@1.0.vndk.29.arm64.vendor",
+        "android.hardware.media.omx@1.0.vndk.29.arm64.vendor",
+        "android.hardware.media@1.0.vndk.29.arm64.vendor",
+        "android.hardware.memtrack@1.0.vndk.29.arm64.vendor",
+        "android.hardware.neuralnetworks@1.0.vndk.29.arm64.vendor",
+        "android.hardware.neuralnetworks@1.1.vndk.29.arm64.vendor",
+        "android.hardware.neuralnetworks@1.2.vndk.29.arm64.vendor",
+        "android.hardware.nfc@1.0.vndk.29.arm64.vendor",
+        "android.hardware.nfc@1.1.vndk.29.arm64.vendor",
+        "android.hardware.nfc@1.2.vndk.29.arm64.vendor",
+        "android.hardware.oemlock@1.0.vndk.29.arm64.vendor",
+        "android.hardware.power.stats@1.0.vndk.29.arm64.vendor",
+        "android.hardware.power@1.0.vndk.29.arm64.vendor",
+        "android.hardware.power@1.1.vndk.29.arm64.vendor",
+        "android.hardware.power@1.2.vndk.29.arm64.vendor",
+        "android.hardware.power@1.3.vndk.29.arm64.vendor",
+        "android.hardware.radio.config@1.0.vndk.29.arm64.vendor",
+        "android.hardware.radio.config@1.1.vndk.29.arm64.vendor",
+        "android.hardware.radio.config@1.2.vndk.29.arm64.vendor",
+        "android.hardware.radio.deprecated@1.0.vndk.29.arm64.vendor",
+        "android.hardware.radio@1.0.vndk.29.arm64.vendor",
+        "android.hardware.radio@1.1.vndk.29.arm64.vendor",
+        "android.hardware.radio@1.2.vndk.29.arm64.vendor",
+        "android.hardware.radio@1.3.vndk.29.arm64.vendor",
+        "android.hardware.radio@1.4.vndk.29.arm64.vendor",
+        "android.hardware.secure_element@1.0.vndk.29.arm64.vendor",
+        "android.hardware.secure_element@1.1.vndk.29.arm64.vendor",
+        "android.hardware.sensors@1.0.vndk.29.arm64.vendor",
+        "android.hardware.sensors@2.0.vndk.29.arm64.vendor",
+        "android.hardware.soundtrigger@2.0.vndk.29.arm64.vendor",
+        "android.hardware.soundtrigger@2.0-core.vndk.29.arm64.vendor",
+        "android.hardware.soundtrigger@2.1.vndk.29.arm64.vendor",
+        "android.hardware.soundtrigger@2.2.vndk.29.arm64.vendor",
+        "android.hardware.tetheroffload.config@1.0.vndk.29.arm64.vendor",
+        "android.hardware.tetheroffload.control@1.0.vndk.29.arm64.vendor",
+        "android.hardware.thermal@1.0.vndk.29.arm64.vendor",
+        "android.hardware.thermal@1.1.vndk.29.arm64.vendor",
+        "android.hardware.thermal@2.0.vndk.29.arm64.vendor",
+        "android.hardware.tv.cec@1.0.vndk.29.arm64.vendor",
+        "android.hardware.tv.cec@2.0.vndk.29.arm64.vendor",
+        "android.hardware.tv.input@1.0.vndk.29.arm64.vendor",
+        "android.hardware.usb.gadget@1.0.vndk.29.arm64.vendor",
+        "android.hardware.usb@1.0.vndk.29.arm64.vendor",
+        "android.hardware.usb@1.1.vndk.29.arm64.vendor",
+        "android.hardware.usb@1.2.vndk.29.arm64.vendor",
+        "android.hardware.vibrator@1.0.vndk.29.arm64.vendor",
+        "android.hardware.vibrator@1.1.vndk.29.arm64.vendor",
+        "android.hardware.vibrator@1.2.vndk.29.arm64.vendor",
+        "android.hardware.vibrator@1.3.vndk.29.arm64.vendor",
+        "android.hardware.vr@1.0.vndk.29.arm64.vendor",
+        "android.hardware.weaver@1.0.vndk.29.arm64.vendor",
+        "android.hardware.wifi.hostapd@1.0.vndk.29.arm64.vendor",
+        "android.hardware.wifi.hostapd@1.1.vndk.29.arm64.vendor",
+        "android.hardware.wifi.offload@1.0.vndk.29.arm64.vendor",
+        "android.hardware.wifi.supplicant@1.0.vndk.29.arm64.vendor",
+        "android.hardware.wifi.supplicant@1.1.vndk.29.arm64.vendor",
+        "android.hardware.wifi.supplicant@1.2.vndk.29.arm64.vendor",
+        "android.hardware.wifi@1.0.vndk.29.arm64.vendor",
+        "android.hardware.wifi@1.1.vndk.29.arm64.vendor",
+        "android.hardware.wifi@1.2.vndk.29.arm64.vendor",
+        "android.hardware.wifi@1.3.vndk.29.arm64.vendor",
+        "android.hidl.allocator@1.0.vndk.29.arm64.vendor",
+        "android.hidl.memory.block@1.0.vndk.29.arm64.vendor",
+        "android.hidl.token@1.0.vndk.29.arm64.vendor",
+        "android.hidl.token@1.0-utils.vndk.29.arm64.vendor",
+        "android.system.net.netd@1.0.vndk.29.arm64.vendor",
+        "android.system.net.netd@1.1.vndk.29.arm64.vendor",
+        "android.system.suspend@1.0.vndk.29.arm64.vendor",
+        "android.system.wifi.keystore@1.0.vndk.29.arm64.vendor",
+        "libadf.vndk.29.arm64.vendor",
+        "libaudioroute.vndk.29.arm64.vendor",
+        "libaudioutils.vndk.29.arm64.vendor",
+        "libbinder.vndk.29.arm64.vendor",
+        "libcamera_metadata.vndk.29.arm64.vendor",
+        "libcap.vndk.29.arm64.vendor",
+        "libclang_rt.scudo-aarch64-android.vndk.29.arm64.vendor",
+        "libclang_rt.scudo-arm-android.vndk.29.arm64.vendor",
+        "libclang_rt.scudo_minimal-aarch64-android.vndk.29.arm64.vendor",
+        "libclang_rt.scudo_minimal-arm-android.vndk.29.arm64.vendor",
+        "libclang_rt.ubsan_minimal-aarch64-android.vndk.29.arm64.vendor",
+        "libclang_rt.ubsan_minimal-arm-android.vndk.29.arm64.vendor",
+        "libclang_rt.ubsan_standalone-aarch64-android.vndk.29.arm64.vendor",
+        "libclang_rt.ubsan_standalone-arm-android.vndk.29.arm64.vendor",
+        "libcn-cbor.vndk.29.arm64.vendor",
+        "libcodec2.vndk.29.arm64.vendor",
+        "libcrypto.vndk.29.arm64.vendor",
+        "libcrypto_utils.vndk.29.arm64.vendor",
+        "libcurl.vndk.29.arm64.vendor",
+        "libdiskconfig.vndk.29.arm64.vendor",
+        "libdumpstateutil.vndk.29.arm64.vendor",
+        "libevent.vndk.29.arm64.vendor",
+        "libexif.vndk.29.arm64.vendor",
+        "libexpat.vndk.29.arm64.vendor",
+        "libfmq.vndk.29.arm64.vendor",
+        "libgatekeeper.vndk.29.arm64.vendor",
+        "libgui.vndk.29.arm64.vendor",
+        "libhardware_legacy.vndk.29.arm64.vendor",
+        "libhidlallocatorutils.vndk.29.arm64.vendor",
+        "libhidlcache.vndk.29.arm64.vendor",
+        "libjpeg.vndk.29.arm64.vendor",
+        "libkeymaster_messages.vndk.29.arm64.vendor",
+        "libkeymaster_portable.vndk.29.arm64.vendor",
+        "libldacBT_abr.vndk.29.arm64.vendor",
+        "libldacBT_enc.vndk.29.arm64.vendor",
+        "liblz4.vndk.29.arm64.vendor",
+        "libmedia_helper.vndk.29.arm64.vendor",
+        "libmedia_omx.vndk.29.arm64.vendor",
+        "libmemtrack.vndk.29.arm64.vendor",
+        "libminijail.vndk.29.arm64.vendor",
+        "libmkbootimg_abi_check.vndk.29.arm64.vendor",
+        "libnetutils.vndk.29.arm64.vendor",
+        "libnl.vndk.29.arm64.vendor",
+        "libpcre2.vndk.29.arm64.vendor",
+        "libpiex.vndk.29.arm64.vendor",
+        "libpng.vndk.29.arm64.vendor",
+        "libpower.vndk.29.arm64.vendor",
+        "libprocinfo.vndk.29.arm64.vendor",
+        "libprotobuf-cpp-full.vndk.29.arm64.vendor",
+        "libprotobuf-cpp-lite.vndk.29.arm64.vendor",
+        "libpuresoftkeymasterdevice.vndk.29.arm64.vendor",
+        "libradio_metadata.vndk.29.arm64.vendor",
+        "libselinux.vndk.29.arm64.vendor",
+        "libsoftkeymasterdevice.vndk.29.arm64.vendor",
+        "libspeexresampler.vndk.29.arm64.vendor",
+        "libsqlite.vndk.29.arm64.vendor",
+        "libssl.vndk.29.arm64.vendor",
+        "libstagefright_bufferpool@2.0.vndk.29.arm64.vendor",
+        "libstagefright_bufferqueue_helper.vndk.29.arm64.vendor",
+        "libstagefright_foundation.vndk.29.arm64.vendor",
+        "libstagefright_omx.vndk.29.arm64.vendor",
+        "libstagefright_omx_utils.vndk.29.arm64.vendor",
+        "libstagefright_xmlparser.vndk.29.arm64.vendor",
+        "libsysutils.vndk.29.arm64.vendor",
+        "libtinyalsa.vndk.29.arm64.vendor",
+        "libtinyxml2.vndk.29.arm64.vendor",
+        "libui.vndk.29.arm64.vendor",
+        "libusbhost.vndk.29.arm64.vendor",
+        "libwifi-system-iface.vndk.29.arm64.vendor",
+        "libxml2.vndk.29.arm64.vendor",
+        "libyuv.vndk.29.arm64.vendor",
+        "libziparchive.vndk.29.arm64.vendor",
+        "android.hardware.graphics.common@1.0.vndk.29.arm64.vendor",
+        "android.hardware.graphics.common@1.1.vndk.29.arm64.vendor",
+        "android.hardware.graphics.common@1.2.vndk.29.arm64.vendor",
+        "android.hardware.graphics.mapper@2.0.vndk.29.arm64.vendor",
+        "android.hardware.graphics.mapper@2.1.vndk.29.arm64.vendor",
+        "android.hardware.graphics.mapper@3.0.vndk.29.arm64.vendor",
+        "android.hardware.renderscript@1.0.vndk.29.arm64.vendor",
+        "android.hidl.memory.token@1.0.vndk.29.arm64.vendor",
+        "android.hidl.memory@1.0.vndk.29.arm64.vendor",
+        "android.hidl.memory@1.0-impl.vndk.29.arm64.vendor",
+        "android.hidl.safe_union@1.0.vndk.29.arm64.vendor",
+        "libRSCpuRef.vndk.29.arm64.vendor",
+        "libRSDriver.vndk.29.arm64.vendor",
+        "libRS_internal.vndk.29.arm64.vendor",
+        "libbacktrace.vndk.29.arm64.vendor",
+        "libbase.vndk.29.arm64.vendor",
+        "libbcinfo.vndk.29.arm64.vendor",
+        "libbinderthreadstate.vndk.29.arm64.vendor",
+        "libblas.vndk.29.arm64.vendor",
+        "libc++.vndk.29.arm64.vendor",
+        "libcompiler_rt.vndk.29.arm64.vendor",
+        "libcutils.vndk.29.arm64.vendor",
+        "libhardware.vndk.29.arm64.vendor",
+        "libhidlbase.vndk.29.arm64.vendor",
+        "libhidlmemory.vndk.29.arm64.vendor",
+        "libhidltransport.vndk.29.arm64.vendor",
+        "libhwbinder.vndk.29.arm64.vendor",
+        "libhwbinder_noltopgo.vndk.29.arm64.vendor",
+        "libion.vndk.29.arm64.vendor",
+        "libjsoncpp.vndk.29.arm64.vendor",
+        "liblzma.vndk.29.arm64.vendor",
+        "libprocessgroup.vndk.29.arm64.vendor",
+        "libunwindstack.vndk.29.arm64.vendor",
+        "libutils.vndk.29.arm64.vendor",
+        "libutilscallstack.vndk.29.arm64.vendor",
+        "libz.vndk.29.arm64.vendor",
+        "ld.config.29.txt",
+        "llndk.libraries.29.txt",
+        "vndksp.libraries.29.txt",
+    ],
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.cameraservice.common@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.frameworks.cameraservice.common@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.frameworks.cameraservice.common@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.cameraservice.device@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.frameworks.cameraservice.device@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.frameworks.cameraservice.device@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.cameraservice.service@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.frameworks.cameraservice.service@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.frameworks.cameraservice.service@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.displayservice@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.frameworks.displayservice@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.frameworks.displayservice@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.schedulerservice@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.frameworks.schedulerservice@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.frameworks.schedulerservice@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.sensorservice@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.frameworks.sensorservice@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.frameworks.sensorservice@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.stats@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.frameworks.stats@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.frameworks.stats@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.frameworks.vr.composer@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.frameworks.vr.composer@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.frameworks.vr.composer@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.atrace@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.atrace@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.atrace@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.common@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.audio.common@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.audio.common@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.common@4.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.audio.common@4.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.audio.common@4.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.common@5.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.audio.common@5.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.audio.common@5.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.effect@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.audio.effect@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.audio.effect@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.effect@4.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.audio.effect@4.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.audio.effect@4.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio.effect@5.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.audio.effect@5.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.audio.effect@5.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.audio@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.audio@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio@4.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.audio@4.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.audio@4.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.audio@5.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.audio@5.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.audio@5.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.authsecret@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.authsecret@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.authsecret@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.automotive.audiocontrol@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.automotive.audiocontrol@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.automotive.audiocontrol@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.automotive.evs@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.automotive.evs@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.automotive.evs@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.automotive.vehicle@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.automotive.vehicle@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.automotive.vehicle@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.biometrics.face@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.biometrics.face@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.biometrics.face@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.biometrics.fingerprint@2.1",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.biometrics.fingerprint@2.1.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.biometrics.fingerprint@2.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.bluetooth.a2dp@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.bluetooth.a2dp@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.bluetooth.a2dp@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.bluetooth.audio@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.bluetooth.audio@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.bluetooth.audio@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.bluetooth@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.bluetooth@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.bluetooth@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.boot@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.boot@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.boot@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.broadcastradio@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.broadcastradio@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.broadcastradio@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.broadcastradio@1.1",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.broadcastradio@1.1.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.broadcastradio@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.broadcastradio@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.broadcastradio@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.broadcastradio@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.common@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.camera.common@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.camera.common@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.camera.device@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.camera.device@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@3.2",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.camera.device@3.2.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.camera.device@3.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@3.3",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.camera.device@3.3.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.camera.device@3.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@3.4",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.camera.device@3.4.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.camera.device@3.4.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.device@3.5",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.camera.device@3.5.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.camera.device@3.5.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.metadata@3.2",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.camera.metadata@3.2.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.camera.metadata@3.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.metadata@3.3",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.camera.metadata@3.3.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.camera.metadata@3.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.metadata@3.4",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.camera.metadata@3.4.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.camera.metadata@3.4.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.provider@2.4",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.camera.provider@2.4.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.camera.provider@2.4.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.camera.provider@2.5",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.camera.provider@2.5.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.camera.provider@2.5.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.cas.native@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.cas.native@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.cas.native@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.cas@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.cas@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.cas@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.cas@1.1",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.cas@1.1.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.cas@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.configstore-utils",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.configstore-utils.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.configstore-utils.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.configstore@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.configstore@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.configstore@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.configstore@1.1",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.configstore@1.1.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.configstore@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.confirmationui-support-lib",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.confirmationui-support-lib.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.confirmationui-support-lib.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.confirmationui@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.confirmationui@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.confirmationui@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.contexthub@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.contexthub@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.contexthub@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.drm@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.drm@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.drm@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.drm@1.1",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.drm@1.1.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.drm@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.drm@1.2",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.drm@1.2.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.drm@1.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.dumpstate@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.dumpstate@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.dumpstate@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.fastboot@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.fastboot@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.fastboot@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gatekeeper@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.gatekeeper@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.gatekeeper@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss.measurement_corrections@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.gnss.measurement_corrections@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.gnss.measurement_corrections@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss.visibility_control@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.gnss.visibility_control@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.gnss.visibility_control@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.gnss@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.gnss@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss@1.1",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.gnss@1.1.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.gnss@1.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.gnss@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.gnss@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.gnss@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.allocator@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.graphics.allocator@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.graphics.allocator@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.allocator@3.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.graphics.allocator@3.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.graphics.allocator@3.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.bufferqueue@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.graphics.bufferqueue@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.graphics.bufferqueue@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.bufferqueue@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.graphics.bufferqueue@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.graphics.bufferqueue@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.composer@2.1",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.graphics.composer@2.1.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.graphics.composer@2.1.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.composer@2.2",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.graphics.composer@2.2.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.graphics.composer@2.2.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.graphics.composer@2.3",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.graphics.composer@2.3.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.graphics.composer@2.3.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.health.storage@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.health.storage@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.health.storage@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.health@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.health@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.health@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.health@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.health@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.health@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.input.classifier@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.input.classifier@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.input.classifier@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.input.common@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.input.common@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.input.common@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.ir@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.ir@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.ir@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.keymaster@3.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.keymaster@3.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.keymaster@3.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.keymaster@4.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.keymaster@4.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.keymaster@4.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.light@2.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.light@2.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.light@2.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.media.bufferpool@1.0",
+    version: "29",
+    target_arch: "arm64",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.media.bufferpool@1.0.so"],
+        },
+        arm64: {
+            srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.media.bufferpool@1.0.so"],
+        },
+    },
+}
+
+vndk_prebuilt_shared {
+    name: "android.hardware.media.bufferpool@2.0",
+    version: "29",