Snap for 6439596 from f3e3510f142b99c6b9dd3d9e434971d6a4e56d37 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: I5828d273e74d35950419ed644e20e6c2ae04421d

24 files changed, 147 insertions, 272 deletions

diff --git a/Android.bp b/Android.bp
index 8d586af..45afb6f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4,147 +4,36 @@
 prebuilt_etc {
     name: "llndk.libraries.28.txt",
     target: {
-        android_arm: {
-            src: "arm/configs/llndk.libraries.28.txt",
-        },
         android_arm64: {
             src: "arm64/configs/llndk.libraries.28.txt",
         },
-        android_x86: {
-            src: "x86/configs/llndk.libraries.28.txt",
-        },
-        android_x86_64: {
-            src: "x86_64/configs/llndk.libraries.28.txt",
-        },
-    },
-}
-
-prebuilt_etc {
-    name: "vndksp.libraries.28.txt",
-    target: {
         android_arm: {
-            src: "arm/configs/vndksp.libraries.28.txt",
-        },
-        android_arm64: {
-            src: "arm64/configs/vndksp.libraries.28.txt",
-        },
-        android_x86: {
-            src: "x86/configs/vndksp.libraries.28.txt",
+            src: "arm/configs/llndk.libraries.28.txt",
         },
         android_x86_64: {
-            src: "x86_64/configs/vndksp.libraries.28.txt",
-        },
-    },
-}
-
-prebuilt_etc {
-    name: "vndkcore.libraries.28.txt",
-    target: {
-        android_arm: {
-            src: "arm/configs/vndkcore.libraries.28.txt",
-        },
-        android_arm64: {
-            src: "arm64/configs/vndkcore.libraries.28.txt",
+            src: "x86_64/configs/llndk.libraries.28.txt",
         },
         android_x86: {
-            src: "x86/configs/vndkcore.libraries.28.txt",
-        },
-        android_x86_64: {
-            src: "x86_64/configs/vndkcore.libraries.28.txt",
+            src: "x86/configs/llndk.libraries.28.txt",
         },
     },
 }
 
 prebuilt_etc {
-    name: "vndkprivate.libraries.28.txt",
-    target: {
-        android_arm: {
-            src: "arm/configs/vndkprivate.libraries.28.txt",
-        },
-        android_arm64: {
-            src: "arm64/configs/vndkprivate.libraries.28.txt",
-        },
-        android_x86: {
-            src: "x86/configs/vndkprivate.libraries.28.txt",
-        },
-        android_x86_64: {
-            src: "x86_64/configs/vndkprivate.libraries.28.txt",
-        },
-    },
-}
-
-// Some vendor prebuilts reference libprotobuf-cpp-lite.so and
-// libprotobuf-cpp-full.so and expect the 3.0.0-beta3 version.
-// The new version of protobuf will be installed as
-// /vendor/lib64/libprotobuf-cpp-lite-3.9.1.so.  The VNDK doesn't
-// help here because we compile old devices against master and not
-// an old VNDK snapshot.  We need to continue to provide a vendor
-// libprotobuf-cpp-lite.so until all products in master get updated
-// prebuilts or are obsoleted.
-
-// TODO(b/142220143): should these modules get moved somewhere else?
-cc_prebuilt_library_shared {
-    name: "libprotobuf-cpp-lite-vendorcompat",
-    stem: "libprotobuf-cpp-lite",
-    vendor: true,
-    // These are already stripped, and restripping them just issues diagnostics.
-    strip: {
-        none: true,
-    },
+    name: "vndksp.libraries.28.txt",
     target: {
         android_arm64: {
-            srcs: ["arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so"],
+            src: "arm64/configs/vndksp.libraries.28.txt",
         },
         android_arm: {
-            srcs: ["arm/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so"],
+            src: "arm/configs/vndksp.libraries.28.txt",
         },
         android_x86_64: {
-            srcs: ["x86_64/arch-x86_64-x86_64/shared/vndk-core/libprotobuf-cpp-lite.so"],
+            src: "x86_64/configs/vndksp.libraries.28.txt",
         },
         android_x86: {
-            srcs: ["x86/arch-x86-x86/shared/vndk-core/libprotobuf-cpp-lite.so"],
+            src: "x86/configs/vndksp.libraries.28.txt",
         },
     },
-
-    shared_libs: [
-        "libc++",
-        "libc",
-        "libdl",
-        "liblog",
-        "libm",
-        "libz",
-    ],
 }
 
-cc_prebuilt_library_shared {
-    name: "libprotobuf-cpp-full-vendorcompat",
-    stem: "libprotobuf-cpp-full",
-    vendor: true,
-    // These are already stripped, and restripping them just issues diagnostics.
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: ["arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so"],
-        },
-        android_arm: {
-            srcs: ["arm/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so"],
-        },
-        android_x86_64: {
-            srcs: ["x86_64/arch-x86_64-x86_64/shared/vndk-core/libprotobuf-cpp-full.so"],
-        },
-        android_x86: {
-            srcs: ["x86/arch-x86-x86/shared/vndk-core/libprotobuf-cpp-full.so"],
-        },
-    },
-
-    shared_libs: [
-        "libc++",
-        "libc",
-        "libdl",
-        "liblog",
-        "libm",
-        "libz",
-    ],
-}
diff --git a/arm/Android.bp b/arm/Android.bp
index cfe21e7..de63073 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -237,8 +237,6 @@ phony {
         "ld.config.28.txt",
         "llndk.libraries.28.txt",
         "vndksp.libraries.28.txt",
-        "vndkcore.libraries.28.txt",
-        "vndkprivate.libraries.28.txt",
     ],
 }
 
@@ -3405,9 +3403,9 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
+    relative_install_path: "hw",
     arch: {
         arm: {
-            relative_install_path: "hw",
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
     },
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
index 22be2bc..7c17959 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so
diff --git a/arm/binder32/Android.bp b/arm/binder32/Android.bp
index a857fb7..500b5f3 100644
--- a/arm/binder32/Android.bp
+++ b/arm/binder32/Android.bp
@@ -237,8 +237,6 @@ phony {
         "ld.config.28.txt",
         "llndk.libraries.28.txt",
         "vndksp.libraries.28.txt",
-        "vndkcore.libraries.28.txt",
-        "vndkprivate.libraries.28.txt",
     ],
 }
 
@@ -3612,9 +3610,9 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
+    relative_install_path: "hw",
     arch: {
         arm: {
-            relative_install_path: "hw",
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
     },
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
index 22be2bc..7c17959 100755
--- 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
diff --git a/arm/configs/vndkcore.libraries.28.txt b/arm/configs/vndkcore.libraries.txt
index 1e35591..1e35591 100644
--- a/arm/configs/vndkcore.libraries.28.txt
+++ b/arm/configs/vndkcore.libraries.txt
diff --git a/arm/configs/vndkprivate.libraries.28.txt b/arm/configs/vndkprivate.libraries.txt
index 2699f6a..2699f6a 100644
--- a/arm/configs/vndkprivate.libraries.28.txt
+++ b/arm/configs/vndkprivate.libraries.txt
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 3e5969b..2ad0cd9 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -238,8 +238,6 @@ phony {
         "ld.config.28.txt",
         "llndk.libraries.28.txt",
         "vndksp.libraries.28.txt",
-        "vndkcore.libraries.28.txt",
-        "vndkprivate.libraries.28.txt",
     ],
 }
 
@@ -3973,13 +3971,12 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
+    relative_install_path: "hw",
     arch: {
         arm: {
-            relative_install_path: "hw",
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
         arm64: {
-            relative_install_path: "hw",
             srcs: ["arch-arm64-armv8-a/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
     },
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libminijail.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libminijail.so
index 8c2d723..6fba408 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libminijail.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libminijail.so
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libminijail.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libminijail.so
index e53a1f0..5550456 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libminijail.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libminijail.so
diff --git a/arm64/configs/vndkcore.libraries.28.txt b/arm64/configs/vndkcore.libraries.txt
index b5f28ed..b5f28ed 100644
--- a/arm64/configs/vndkcore.libraries.28.txt
+++ b/arm64/configs/vndkcore.libraries.txt
diff --git a/arm64/configs/vndkprivate.libraries.28.txt b/arm64/configs/vndkprivate.libraries.txt
index 2699f6a..2699f6a 100644
--- a/arm64/configs/vndkprivate.libraries.28.txt
+++ b/arm64/configs/vndkprivate.libraries.txt
diff --git a/common/Android.bp b/common/Android.bp
index 8d2d3d5..49aabea 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -2,188 +2,188 @@
 // DO NOT EDIT
 
 filegroup {
-    name: "vndk-v28-libminijail.so-notice",
-    srcs: ["NOTICE_FILES/libminijail.so.txt"],
+    name: "vndk-v28-libz.so-notice",
+    srcs: ["NOTICE_FILES/libz.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_amrnb_common.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_amrnb_common.so.txt"],
+    name: "vndk-v28-libxml2.so-notice",
+    srcs: ["NOTICE_FILES/libxml2.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libpagemap.so-notice",
-    srcs: ["NOTICE_FILES/libpagemap.so.txt"],
+    name: "vndk-v28-libtinyalsa.so-notice",
+    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libpiex.so-notice",
-    srcs: ["NOTICE_FILES/libpiex.so.txt"],
+    name: "vndk-v28-libcurl.so-notice",
+    srcs: ["NOTICE_FILES/libcurl.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libhwbinder_noltopgo.so-notice",
-    srcs: ["NOTICE_FILES/libhwbinder_noltopgo.so.txt"],
+    name: "vndk-v28-libmedia_helper.so-notice",
+    srcs: ["NOTICE_FILES/libmedia_helper.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libldacBT_abr.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
+    name: "vndk-v28-libutils.so-notice",
+    srcs: ["NOTICE_FILES/libutils.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libz.so-notice",
-    srcs: ["NOTICE_FILES/libz.so.txt"],
+    name: "vndk-v28-libpuresoftkeymasterdevice.so-notice",
+    srcs: ["NOTICE_FILES/libpuresoftkeymasterdevice.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_g711dec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_g711dec.so.txt"],
+    name: "vndk-v28-libstagefright_enc_common.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_enc_common.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libldacBT_enc.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
+    name: "vndk-v28-libstagefright_foundation.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libhardware.so-notice",
-    srcs: ["NOTICE_FILES/libhardware.so.txt"],
+    name: "vndk-v28-libpcre2.so-notice",
+    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libc++.so-notice",
-    srcs: ["NOTICE_FILES/libc++.so.txt"],
+    name: "vndk-v28-libui.so-notice",
+    srcs: ["NOTICE_FILES/libui.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libspeexresampler.so-notice",
-    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
+    name: "vndk-v28-libstagefright_soft_flacenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_flacenc.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libjpeg.so-notice",
-    srcs: ["NOTICE_FILES/libjpeg.so.txt"],
+    name: "vndk-v28-libkeymaster_messages.so-notice",
+    srcs: ["NOTICE_FILES/libkeymaster_messages.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libnetutils.so-notice",
-    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
+    name: "vndk-v28-libstagefright_soft_g711dec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_g711dec.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_aacdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_aacdec.so.txt"],
+    name: "vndk-v28-libhwbinder_noltopgo.so-notice",
+    srcs: ["NOTICE_FILES/libhwbinder_noltopgo.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libprotobuf-cpp-full.so-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-full.so.txt"],
+    name: "vndk-v28-libnetutils.so-notice",
+    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libpuresoftkeymasterdevice.so-notice",
-    srcs: ["NOTICE_FILES/libpuresoftkeymasterdevice.so.txt"],
+    name: "vndk-v28-libldacBT_abr.so-notice",
+    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libevent.so-notice",
-    srcs: ["NOTICE_FILES/libevent.so.txt"],
+    name: "vndk-v28-libaudioroute.so-notice",
+    srcs: ["NOTICE_FILES/libaudioroute.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_omx.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
+    name: "vndk-v28-libstagefright_soft_flacdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_flacdec.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_gsmdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_gsmdec.so.txt"],
+    name: "vndk-v28-libstagefright_omx_utils.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_vorbisdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt"],
+    name: "vndk-v28-libcutils.so-notice",
+    srcs: ["NOTICE_FILES/libcutils.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libcompiler_rt.so-notice",
-    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
+    name: "vndk-v28-libstagefright_soft_amrdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_amrdec.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libhwbinder.so-notice",
-    srcs: ["NOTICE_FILES/libhwbinder.so.txt"],
+    name: "vndk-v28-libpower.so-notice",
+    srcs: ["NOTICE_FILES/libpower.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libvorbisidec.so-notice",
-    srcs: ["NOTICE_FILES/libvorbisidec.so.txt"],
+    name: "vndk-v28-libstagefright_soft_amrwbenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libpower.so-notice",
-    srcs: ["NOTICE_FILES/libpower.so.txt"],
+    name: "vndk-v28-libnl.so-notice",
+    srcs: ["NOTICE_FILES/libnl.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libblas.so-notice",
-    srcs: ["NOTICE_FILES/libblas.so.txt"],
+    name: "vndk-v28-libstagefright_soft_mpeg4dec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libcurl.so-notice",
-    srcs: ["NOTICE_FILES/libcurl.so.txt"],
+    name: "vndk-v28-libsoftkeymasterdevice.so-notice",
+    srcs: ["NOTICE_FILES/libsoftkeymasterdevice.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_omx_utils.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
+    name: "vndk-v28-libstagefright_soft_amrnbenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libcap.so-notice",
-    srcs: ["NOTICE_FILES/libcap.so.txt"],
+    name: "vndk-v28-libprotobuf-cpp-lite.so-notice",
+    srcs: ["NOTICE_FILES/libprotobuf-cpp-lite.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libopus.so-notice",
-    srcs: ["NOTICE_FILES/libopus.so.txt"],
+    name: "vndk-v28-libcompiler_rt.so-notice",
+    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-liblz4.so-notice",
-    srcs: ["NOTICE_FILES/liblz4.so.txt"],
+    name: "vndk-v28-libstagefright_soft_aacdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_aacdec.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libtinyxml2.so-notice",
-    srcs: ["NOTICE_FILES/libtinyxml2.so.txt"],
+    name: "vndk-v28-libhardware.so-notice",
+    srcs: ["NOTICE_FILES/libhardware.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libui.so-notice",
-    srcs: ["NOTICE_FILES/libui.so.txt"],
+    name: "vndk-v28-libstagefright_soft_vpxdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_vpxdec.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_amrdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrdec.so.txt"],
+    name: "vndk-v28-libmedia_omx.so-notice",
+    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libutilscallstack.so-notice",
-    srcs: ["NOTICE_FILES/libutilscallstack.so.txt"],
+    name: "vndk-v28-libjpeg.so-notice",
+    srcs: ["NOTICE_FILES/libjpeg.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libcrypto.so-notice",
-    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
+    name: "vndk-v28-libblas.so-notice",
+    srcs: ["NOTICE_FILES/libblas.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libprotobuf-cpp-lite.so-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-lite.so.txt"],
+    name: "vndk-v28-libspeexresampler.so-notice",
+    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
 }
 
 filegroup {
@@ -192,68 +192,73 @@ filegroup {
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_enc_common.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_enc_common.so.txt"],
+    name: "vndk-v28-liblz4.so-notice",
+    srcs: ["NOTICE_FILES/liblz4.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libssl.so-notice",
-    srcs: ["NOTICE_FILES/libssl.so.txt"],
+    name: "vndk-v28-libstagefright_soft_aacenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_aacenc.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libxml2.so-notice",
-    srcs: ["NOTICE_FILES/libxml2.so.txt"],
+    name: "vndk-v28-libopus.so-notice",
+    srcs: ["NOTICE_FILES/libopus.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_mpeg4dec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt"],
+    name: "vndk-v28-libevent.so-notice",
+    srcs: ["NOTICE_FILES/libevent.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libtinyalsa.so-notice",
-    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
+    name: "vndk-v28-libstagefright_soft_rawdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_rawdec.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libsoftkeymasterdevice.so-notice",
-    srcs: ["NOTICE_FILES/libsoftkeymasterdevice.so.txt"],
+    name: "vndk-v28-libprotobuf-cpp-full.so-notice",
+    srcs: ["NOTICE_FILES/libprotobuf-cpp-full.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libnl.so-notice",
-    srcs: ["NOTICE_FILES/libnl.so.txt"],
+    name: "vndk-v28-libunwind.so-notice",
+    srcs: ["NOTICE_FILES/libunwind.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libmedia_helper.so-notice",
-    srcs: ["NOTICE_FILES/libmedia_helper.so.txt"],
+    name: "vndk-v28-libpagemap.so-notice",
+    srcs: ["NOTICE_FILES/libpagemap.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_foundation.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
+    name: "vndk-v28-libldacBT_enc.so-notice",
+    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libkeymaster_portable.so-notice",
-    srcs: ["NOTICE_FILES/libkeymaster_portable.so.txt"],
+    name: "vndk-v28-libpiex.so-notice",
+    srcs: ["NOTICE_FILES/libpiex.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libhardware_legacy.so-notice",
-    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
+    name: "vndk-v28-libstagefright_soft_vpxenc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_vpxenc.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libexif.so-notice",
-    srcs: ["NOTICE_FILES/libexif.so.txt"],
+    name: "vndk-v28-libstagefright_soft_gsmdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_gsmdec.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libunwind.so-notice",
-    srcs: ["NOTICE_FILES/libunwind.so.txt"],
+    name: "vndk-v28-libcrypto.so-notice",
+    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
+}
+
+filegroup {
+    name: "vndk-v28-libexif.so-notice",
+    srcs: ["NOTICE_FILES/libexif.so.txt"],
 }
 
 filegroup {
@@ -262,38 +267,38 @@ filegroup {
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_flacdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_flacdec.so.txt"],
+    name: "vndk-v28-libhardware_legacy.so-notice",
+    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_amrwbenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt"],
+    name: "vndk-v28-libstagefright_omx.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_aacenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_aacenc.so.txt"],
+    name: "vndk-v28-libstagefright_soft_mpeg4enc.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libaudioroute.so-notice",
-    srcs: ["NOTICE_FILES/libaudioroute.so.txt"],
+    name: "vndk-v28-libminijail.so-notice",
+    srcs: ["NOTICE_FILES/libminijail.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_mpeg4enc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt"],
+    name: "vndk-v28-libstagefright_amrnb_common.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_amrnb_common.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libkeymaster_messages.so-notice",
-    srcs: ["NOTICE_FILES/libkeymaster_messages.so.txt"],
+    name: "vndk-v28-libssl.so-notice",
+    srcs: ["NOTICE_FILES/libssl.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_rawdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_rawdec.so.txt"],
+    name: "vndk-v28-libc++.so-notice",
+    srcs: ["NOTICE_FILES/libc++.so.txt"],
 }
 
 filegroup {
@@ -302,41 +307,36 @@ filegroup {
 }
 
 filegroup {
-    name: "vndk-v28-libmedia_omx.so-notice",
-    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v28-libutils.so-notice",
-    srcs: ["NOTICE_FILES/libutils.so.txt"],
+    name: "vndk-v28-libcap.so-notice",
+    srcs: ["NOTICE_FILES/libcap.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libcutils.so-notice",
-    srcs: ["NOTICE_FILES/libcutils.so.txt"],
+    name: "vndk-v28-libhwbinder.so-notice",
+    srcs: ["NOTICE_FILES/libhwbinder.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_flacenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_flacenc.so.txt"],
+    name: "vndk-v28-libtinyxml2.so-notice",
+    srcs: ["NOTICE_FILES/libtinyxml2.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_vpxenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vpxenc.so.txt"],
+    name: "vndk-v28-libstagefright_soft_vorbisdec.so-notice",
+    srcs: ["NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_amrnbenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt"],
+    name: "vndk-v28-libutilscallstack.so-notice",
+    srcs: ["NOTICE_FILES/libutilscallstack.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libstagefright_soft_vpxdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vpxdec.so.txt"],
+    name: "vndk-v28-libkeymaster_portable.so-notice",
+    srcs: ["NOTICE_FILES/libkeymaster_portable.so.txt"],
 }
 
 filegroup {
-    name: "vndk-v28-libpcre2.so-notice",
-    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
+    name: "vndk-v28-libvorbisidec.so-notice",
+    srcs: ["NOTICE_FILES/libvorbisidec.so.txt"],
 }
diff --git a/x86/Android.bp b/x86/Android.bp
index 36ba26b..d31cc0e 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -237,8 +237,6 @@ phony {
         "ld.config.28.txt",
         "llndk.libraries.28.txt",
         "vndksp.libraries.28.txt",
-        "vndkcore.libraries.28.txt",
-        "vndkprivate.libraries.28.txt",
     ],
 }
 
@@ -3405,9 +3403,9 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
+    relative_install_path: "hw",
     arch: {
         x86: {
-            relative_install_path: "hw",
             srcs: ["arch-x86-x86/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
     },
diff --git a/x86/arch-x86-x86/shared/vndk-core/libminijail.so b/x86/arch-x86-x86/shared/vndk-core/libminijail.so
index d4f6594..28c0932 100755
--- a/x86/arch-x86-x86/shared/vndk-core/libminijail.so
+++ b/x86/arch-x86-x86/shared/vndk-core/libminijail.so
diff --git a/x86/binder32/Android.bp b/x86/binder32/Android.bp
index 92b3128..e07fe27 100644
--- a/x86/binder32/Android.bp
+++ b/x86/binder32/Android.bp
@@ -237,8 +237,6 @@ phony {
         "ld.config.28.txt",
         "llndk.libraries.28.txt",
         "vndksp.libraries.28.txt",
-        "vndkcore.libraries.28.txt",
-        "vndkprivate.libraries.28.txt",
     ],
 }
 
@@ -3612,9 +3610,9 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
+    relative_install_path: "hw",
     arch: {
         x86: {
-            relative_install_path: "hw",
             srcs: ["arch-x86-x86/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
     },
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/libminijail.so b/x86/binder32/arch-x86-x86/shared/vndk-core/libminijail.so
index d4f6594..28c0932 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/libminijail.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/libminijail.so
diff --git a/x86/configs/vndkcore.libraries.28.txt b/x86/configs/vndkcore.libraries.txt
index 9bed410..9bed410 100644
--- a/x86/configs/vndkcore.libraries.28.txt
+++ b/x86/configs/vndkcore.libraries.txt
diff --git a/x86/configs/vndkprivate.libraries.28.txt b/x86/configs/vndkprivate.libraries.txt
index 2699f6a..2699f6a 100644
--- a/x86/configs/vndkprivate.libraries.28.txt
+++ b/x86/configs/vndkprivate.libraries.txt
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index ea4e2a5..7b9527a 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -238,8 +238,6 @@ phony {
         "ld.config.28.txt",
         "llndk.libraries.28.txt",
         "vndksp.libraries.28.txt",
-        "vndkcore.libraries.28.txt",
-        "vndkprivate.libraries.28.txt",
     ],
 }
 
@@ -3973,13 +3971,12 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
+    relative_install_path: "hw",
     arch: {
         x86: {
-            relative_install_path: "hw",
             srcs: ["arch-x86-x86_64/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
         x86_64: {
-            relative_install_path: "hw",
             srcs: ["arch-x86_64-x86_64/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
         },
     },
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libminijail.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libminijail.so
index 888d2ad..75bad80 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libminijail.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libminijail.so
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libminijail.so b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libminijail.so
index 53fa22b..7b193fb 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/libminijail.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/libminijail.so
diff --git a/x86_64/configs/vndkcore.libraries.28.txt b/x86_64/configs/vndkcore.libraries.txt
index 612a533..612a533 100644
--- a/x86_64/configs/vndkcore.libraries.28.txt
+++ b/x86_64/configs/vndkcore.libraries.txt
diff --git a/x86_64/configs/vndkprivate.libraries.28.txt b/x86_64/configs/vndkprivate.libraries.txt
index 2699f6a..2699f6a 100644
--- a/x86_64/configs/vndkprivate.libraries.28.txt
+++ b/x86_64/configs/vndkprivate.libraries.txt