Replace obsolete notice property with licenses am: 3a4670b8a8 am: 0d105f2047 am: e430a6ea36 am: f18a38eb50HEADmastermain-16k-with-phonesmain

Original change: https://android-review.googlesource.com/c/platform/prebuilts/vndk/v28/+/2154447

Change-Id: Iab0cf5899acd6eefdb80b2fee2a03ec32e42f429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7 files changed, 709 insertions, 612 deletions

diff --git a/arm/Android.bp b/arm/Android.bp
index 5543e5d..3d043f9 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -1726,7 +1726,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libaudioroute.so-notice",
+    licenses: ["vndk-v28-libaudioroute.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so"],
@@ -1791,7 +1791,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcap.so-notice",
+    licenses: ["vndk-v28-libcap.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcap.so"],
@@ -1824,7 +1824,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcrypto.so-notice",
+    licenses: ["vndk-v28-libcrypto.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so"],
@@ -1857,7 +1857,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcurl.so-notice",
+    licenses: ["vndk-v28-libcurl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so"],
@@ -1906,7 +1906,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libevent.so-notice",
+    licenses: ["vndk-v28-libevent.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libevent.so"],
@@ -1923,7 +1923,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libexif.so-notice",
+    licenses: ["vndk-v28-libexif.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexif.so"],
@@ -2005,7 +2005,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libhardware_legacy.so-notice",
+    licenses: ["vndk-v28-libhardware_legacy.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so"],
@@ -2054,7 +2054,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libjpeg.so-notice",
+    licenses: ["vndk-v28-libjpeg.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so"],
@@ -2071,7 +2071,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v28-libkeymaster_messages.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so"],
@@ -2088,7 +2088,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v28-libkeymaster_portable.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so"],
@@ -2105,7 +2105,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_abr.so-notice",
+    licenses: ["vndk-v28-libldacBT_abr.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so"],
@@ -2122,7 +2122,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_enc.so-notice",
+    licenses: ["vndk-v28-libldacBT_enc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so"],
@@ -2139,7 +2139,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-liblz4.so-notice",
+    licenses: ["vndk-v28-liblz4.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so"],
@@ -2156,7 +2156,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_helper.so-notice",
+    licenses: ["vndk-v28-libmedia_helper.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so"],
@@ -2173,7 +2173,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_omx.so-notice",
+    licenses: ["vndk-v28-libmedia_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so"],
@@ -2206,7 +2206,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libminijail.so-notice",
+    licenses: ["vndk-v28-libminijail.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so"],
@@ -2239,7 +2239,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnetutils.so-notice",
+    licenses: ["vndk-v28-libnetutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so"],
@@ -2256,7 +2256,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnl.so-notice",
+    licenses: ["vndk-v28-libnl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnl.so"],
@@ -2273,7 +2273,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libopus.so-notice",
+    licenses: ["vndk-v28-libopus.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libopus.so"],
@@ -2290,7 +2290,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpagemap.so-notice",
+    licenses: ["vndk-v28-libpagemap.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpagemap.so"],
@@ -2307,7 +2307,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpcre2.so-notice",
+    licenses: ["vndk-v28-libpcre2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so"],
@@ -2324,7 +2324,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpiex.so-notice",
+    licenses: ["vndk-v28-libpiex.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so"],
@@ -2357,7 +2357,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpower.so-notice",
+    licenses: ["vndk-v28-libpower.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpower.so"],
@@ -2390,7 +2390,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v28-libprotobuf-cpp-full.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2407,7 +2407,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v28-libprotobuf-cpp-lite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2424,7 +2424,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v28-libpuresoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -2473,7 +2473,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v28-libsoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2490,7 +2490,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libspeexresampler.so-notice",
+    licenses: ["vndk-v28-libspeexresampler.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so"],
@@ -2507,7 +2507,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsqlite.so-notice",
+    licenses: ["vndk-v28-libsqlite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so"],
@@ -2524,7 +2524,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libssl.so-notice",
+    licenses: ["vndk-v28-libssl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libssl.so"],
@@ -2541,7 +2541,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_amrnb_common.so-notice",
+    licenses: ["vndk-v28-libstagefright_amrnb_common.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -2574,7 +2574,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_enc_common.so-notice",
+    licenses: ["vndk-v28-libstagefright_enc_common.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_enc_common.so"],
@@ -2591,7 +2591,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_flacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_flacdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_flacdec.so"],
@@ -2608,7 +2608,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v28-libstagefright_foundation.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so"],
@@ -2625,7 +2625,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx.so-notice",
+    licenses: ["vndk-v28-libstagefright_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so"],
@@ -2642,7 +2642,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v28-libstagefright_omx_utils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -2659,7 +2659,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_aacdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -2676,7 +2676,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_aacenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -2693,7 +2693,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -2710,7 +2710,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrnbenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrnbenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -2727,7 +2727,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrwbenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrwbenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -2776,7 +2776,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_flacdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -2793,7 +2793,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_flacenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -2810,7 +2810,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_g711dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_g711dec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -2827,7 +2827,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_gsmdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_gsmdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -2860,7 +2860,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mp3dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mp3dec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -2893,7 +2893,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mpeg4dec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -2910,7 +2910,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4enc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mpeg4enc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -2943,7 +2943,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_rawdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_rawdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -2960,7 +2960,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vorbisdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vorbisdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -2977,7 +2977,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vpxdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -2994,7 +2994,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vpxenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -3059,7 +3059,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyalsa.so-notice",
+    licenses: ["vndk-v28-libtinyalsa.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so"],
@@ -3076,7 +3076,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyxml2.so-notice",
+    licenses: ["vndk-v28-libtinyxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so"],
@@ -3093,7 +3093,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libui.so-notice",
+    licenses: ["vndk-v28-libui.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libui.so"],
@@ -3158,7 +3158,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libvorbisidec.so-notice",
+    licenses: ["vndk-v28-libvorbisidec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so"],
@@ -3191,7 +3191,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libxml2.so-notice",
+    licenses: ["vndk-v28-libxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so"],
@@ -3498,7 +3498,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libblas.so-notice",
+    licenses: ["vndk-v28-libblas.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so"],
@@ -3516,7 +3516,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libc++.so-notice",
+    licenses: ["vndk-v28-libc++.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so"],
@@ -3535,7 +3535,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libcompiler_rt.so-notice",
+    licenses: ["vndk-v28-libcompiler_rt.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"],
@@ -3553,7 +3553,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcutils.so-notice",
+    licenses: ["vndk-v28-libcutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so"],
@@ -3571,7 +3571,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhardware.so-notice",
+    licenses: ["vndk-v28-libhardware.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so"],
@@ -3640,7 +3640,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder.so-notice",
+    licenses: ["vndk-v28-libhwbinder.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so"],
@@ -3658,7 +3658,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v28-libhwbinder_noltopgo.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -3711,7 +3711,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libunwind.so-notice",
+    licenses: ["vndk-v28-libunwind.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libunwind.so"],
@@ -3746,7 +3746,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutils.so-notice",
+    licenses: ["vndk-v28-libutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so"],
@@ -3764,7 +3764,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutilscallstack.so-notice",
+    licenses: ["vndk-v28-libutilscallstack.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so"],
@@ -3782,7 +3782,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libz.so-notice",
+    licenses: ["vndk-v28-libz.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libz.so"],
diff --git a/arm/binder32/Android.bp b/arm/binder32/Android.bp
index 0c67f56..03e6347 100644
--- a/arm/binder32/Android.bp
+++ b/arm/binder32/Android.bp
@@ -1834,7 +1834,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libaudioroute.so-notice",
+    licenses: ["vndk-v28-libaudioroute.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so"],
@@ -1903,7 +1903,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcap.so-notice",
+    licenses: ["vndk-v28-libcap.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcap.so"],
@@ -1938,7 +1938,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcrypto.so-notice",
+    licenses: ["vndk-v28-libcrypto.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so"],
@@ -1973,7 +1973,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcurl.so-notice",
+    licenses: ["vndk-v28-libcurl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so"],
@@ -2025,7 +2025,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libevent.so-notice",
+    licenses: ["vndk-v28-libevent.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libevent.so"],
@@ -2043,7 +2043,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libexif.so-notice",
+    licenses: ["vndk-v28-libexif.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexif.so"],
@@ -2130,7 +2130,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libhardware_legacy.so-notice",
+    licenses: ["vndk-v28-libhardware_legacy.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so"],
@@ -2182,7 +2182,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libjpeg.so-notice",
+    licenses: ["vndk-v28-libjpeg.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so"],
@@ -2200,7 +2200,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v28-libkeymaster_messages.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so"],
@@ -2218,7 +2218,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v28-libkeymaster_portable.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so"],
@@ -2236,7 +2236,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_abr.so-notice",
+    licenses: ["vndk-v28-libldacBT_abr.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so"],
@@ -2254,7 +2254,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_enc.so-notice",
+    licenses: ["vndk-v28-libldacBT_enc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so"],
@@ -2272,7 +2272,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-liblz4.so-notice",
+    licenses: ["vndk-v28-liblz4.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so"],
@@ -2290,7 +2290,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_helper.so-notice",
+    licenses: ["vndk-v28-libmedia_helper.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so"],
@@ -2308,7 +2308,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_omx.so-notice",
+    licenses: ["vndk-v28-libmedia_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so"],
@@ -2343,7 +2343,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libminijail.so-notice",
+    licenses: ["vndk-v28-libminijail.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so"],
@@ -2378,7 +2378,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnetutils.so-notice",
+    licenses: ["vndk-v28-libnetutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so"],
@@ -2396,7 +2396,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnl.so-notice",
+    licenses: ["vndk-v28-libnl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnl.so"],
@@ -2414,7 +2414,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libopus.so-notice",
+    licenses: ["vndk-v28-libopus.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libopus.so"],
@@ -2432,7 +2432,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpagemap.so-notice",
+    licenses: ["vndk-v28-libpagemap.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpagemap.so"],
@@ -2450,7 +2450,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpcre2.so-notice",
+    licenses: ["vndk-v28-libpcre2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so"],
@@ -2468,7 +2468,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpiex.so-notice",
+    licenses: ["vndk-v28-libpiex.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so"],
@@ -2503,7 +2503,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpower.so-notice",
+    licenses: ["vndk-v28-libpower.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpower.so"],
@@ -2538,7 +2538,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v28-libprotobuf-cpp-full.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2556,7 +2556,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v28-libprotobuf-cpp-lite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2574,7 +2574,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v28-libpuresoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -2626,7 +2626,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v28-libsoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2644,7 +2644,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libspeexresampler.so-notice",
+    licenses: ["vndk-v28-libspeexresampler.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so"],
@@ -2662,7 +2662,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsqlite.so-notice",
+    licenses: ["vndk-v28-libsqlite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so"],
@@ -2680,7 +2680,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libssl.so-notice",
+    licenses: ["vndk-v28-libssl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libssl.so"],
@@ -2698,7 +2698,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_amrnb_common.so-notice",
+    licenses: ["vndk-v28-libstagefright_amrnb_common.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -2733,7 +2733,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_enc_common.so-notice",
+    licenses: ["vndk-v28-libstagefright_enc_common.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_enc_common.so"],
@@ -2751,7 +2751,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_flacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_flacdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_flacdec.so"],
@@ -2769,7 +2769,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v28-libstagefright_foundation.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so"],
@@ -2787,7 +2787,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx.so-notice",
+    licenses: ["vndk-v28-libstagefright_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so"],
@@ -2805,7 +2805,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v28-libstagefright_omx_utils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -2823,7 +2823,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_aacdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -2841,7 +2841,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_aacenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -2859,7 +2859,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -2877,7 +2877,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrnbenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrnbenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -2895,7 +2895,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrwbenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrwbenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -2947,7 +2947,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_flacdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -2965,7 +2965,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_flacenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -2983,7 +2983,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_g711dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_g711dec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -3001,7 +3001,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_gsmdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_gsmdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -3036,7 +3036,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mp3dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mp3dec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -3071,7 +3071,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mpeg4dec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -3089,7 +3089,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4enc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mpeg4enc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -3124,7 +3124,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_rawdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_rawdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -3142,7 +3142,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vorbisdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vorbisdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -3160,7 +3160,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vpxdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -3178,7 +3178,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vpxenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -3247,7 +3247,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyalsa.so-notice",
+    licenses: ["vndk-v28-libtinyalsa.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so"],
@@ -3265,7 +3265,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyxml2.so-notice",
+    licenses: ["vndk-v28-libtinyxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so"],
@@ -3283,7 +3283,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libui.so-notice",
+    licenses: ["vndk-v28-libui.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libui.so"],
@@ -3352,7 +3352,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libvorbisidec.so-notice",
+    licenses: ["vndk-v28-libvorbisidec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libvorbisidec.so"],
@@ -3387,7 +3387,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libxml2.so-notice",
+    licenses: ["vndk-v28-libxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so"],
@@ -3712,7 +3712,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libblas.so-notice",
+    licenses: ["vndk-v28-libblas.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so"],
@@ -3731,7 +3731,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libc++.so-notice",
+    licenses: ["vndk-v28-libc++.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so"],
@@ -3751,7 +3751,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libcompiler_rt.so-notice",
+    licenses: ["vndk-v28-libcompiler_rt.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"],
@@ -3770,7 +3770,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcutils.so-notice",
+    licenses: ["vndk-v28-libcutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so"],
@@ -3789,7 +3789,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhardware.so-notice",
+    licenses: ["vndk-v28-libhardware.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so"],
@@ -3862,7 +3862,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder.so-notice",
+    licenses: ["vndk-v28-libhwbinder.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so"],
@@ -3881,7 +3881,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v28-libhwbinder_noltopgo.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -3937,7 +3937,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libunwind.so-notice",
+    licenses: ["vndk-v28-libunwind.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libunwind.so"],
@@ -3974,7 +3974,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutils.so-notice",
+    licenses: ["vndk-v28-libutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so"],
@@ -3993,7 +3993,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutilscallstack.so-notice",
+    licenses: ["vndk-v28-libutilscallstack.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so"],
@@ -4012,7 +4012,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libz.so-notice",
+    licenses: ["vndk-v28-libz.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libz.so"],
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 0ceadc4..5997138 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -2047,7 +2047,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libaudioroute.so-notice",
+    licenses: ["vndk-v28-libaudioroute.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libaudioroute.so"],
@@ -2124,7 +2124,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcap.so-notice",
+    licenses: ["vndk-v28-libcap.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcap.so"],
@@ -2163,7 +2163,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcrypto.so-notice",
+    licenses: ["vndk-v28-libcrypto.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcrypto.so"],
@@ -2202,7 +2202,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcurl.so-notice",
+    licenses: ["vndk-v28-libcurl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcurl.so"],
@@ -2260,7 +2260,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libevent.so-notice",
+    licenses: ["vndk-v28-libevent.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libevent.so"],
@@ -2280,7 +2280,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libexif.so-notice",
+    licenses: ["vndk-v28-libexif.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libexif.so"],
@@ -2377,7 +2377,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libhardware_legacy.so-notice",
+    licenses: ["vndk-v28-libhardware_legacy.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libhardware_legacy.so"],
@@ -2435,7 +2435,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libjpeg.so-notice",
+    licenses: ["vndk-v28-libjpeg.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libjpeg.so"],
@@ -2455,7 +2455,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v28-libkeymaster_messages.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libkeymaster_messages.so"],
@@ -2475,7 +2475,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v28-libkeymaster_portable.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libkeymaster_portable.so"],
@@ -2495,7 +2495,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_abr.so-notice",
+    licenses: ["vndk-v28-libldacBT_abr.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libldacBT_abr.so"],
@@ -2515,7 +2515,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_enc.so-notice",
+    licenses: ["vndk-v28-libldacBT_enc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libldacBT_enc.so"],
@@ -2535,7 +2535,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-liblz4.so-notice",
+    licenses: ["vndk-v28-liblz4.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/liblz4.so"],
@@ -2555,7 +2555,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_helper.so-notice",
+    licenses: ["vndk-v28-libmedia_helper.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so"],
@@ -2575,7 +2575,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_omx.so-notice",
+    licenses: ["vndk-v28-libmedia_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libmedia_omx.so"],
@@ -2614,7 +2614,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libminijail.so-notice",
+    licenses: ["vndk-v28-libminijail.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libminijail.so"],
@@ -2653,7 +2653,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnetutils.so-notice",
+    licenses: ["vndk-v28-libnetutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libnetutils.so"],
@@ -2673,7 +2673,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnl.so-notice",
+    licenses: ["vndk-v28-libnl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libnl.so"],
@@ -2693,7 +2693,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libopus.so-notice",
+    licenses: ["vndk-v28-libopus.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libopus.so"],
@@ -2713,7 +2713,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpagemap.so-notice",
+    licenses: ["vndk-v28-libpagemap.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpagemap.so"],
@@ -2733,7 +2733,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpcre2.so-notice",
+    licenses: ["vndk-v28-libpcre2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpcre2.so"],
@@ -2753,7 +2753,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpiex.so-notice",
+    licenses: ["vndk-v28-libpiex.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpiex.so"],
@@ -2792,7 +2792,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpower.so-notice",
+    licenses: ["vndk-v28-libpower.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpower.so"],
@@ -2831,7 +2831,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v28-libprotobuf-cpp-full.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2851,7 +2851,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v28-libprotobuf-cpp-lite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2871,7 +2871,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v28-libpuresoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -2929,7 +2929,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v28-libsoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2949,7 +2949,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libspeexresampler.so-notice",
+    licenses: ["vndk-v28-libspeexresampler.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libspeexresampler.so"],
@@ -2969,7 +2969,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsqlite.so-notice",
+    licenses: ["vndk-v28-libsqlite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libsqlite.so"],
@@ -2989,7 +2989,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libssl.so-notice",
+    licenses: ["vndk-v28-libssl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libssl.so"],
@@ -3009,7 +3009,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_amrnb_common.so-notice",
+    licenses: ["vndk-v28-libstagefright_amrnb_common.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -3048,7 +3048,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_enc_common.so-notice",
+    licenses: ["vndk-v28-libstagefright_enc_common.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_enc_common.so"],
@@ -3068,7 +3068,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_flacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_flacdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_flacdec.so"],
@@ -3088,7 +3088,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v28-libstagefright_foundation.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_foundation.so"],
@@ -3108,7 +3108,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx.so-notice",
+    licenses: ["vndk-v28-libstagefright_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_omx.so"],
@@ -3128,7 +3128,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v28-libstagefright_omx_utils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -3148,7 +3148,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_aacdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -3165,7 +3165,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_aacenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -3182,7 +3182,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -3199,7 +3199,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrnbenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrnbenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -3216,7 +3216,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrwbenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrwbenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -3265,7 +3265,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_flacdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -3282,7 +3282,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_flacenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -3299,7 +3299,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_g711dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_g711dec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -3316,7 +3316,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_gsmdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_gsmdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -3349,7 +3349,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mp3dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mp3dec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -3382,7 +3382,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mpeg4dec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -3399,7 +3399,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4enc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mpeg4enc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -3432,7 +3432,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_rawdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_rawdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -3449,7 +3449,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vorbisdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vorbisdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -3466,7 +3466,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vpxdec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -3483,7 +3483,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vpxenc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -3557,7 +3557,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyalsa.so-notice",
+    licenses: ["vndk-v28-libtinyalsa.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libtinyalsa.so"],
@@ -3577,7 +3577,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyxml2.so-notice",
+    licenses: ["vndk-v28-libtinyxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libtinyxml2.so"],
@@ -3597,7 +3597,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libui.so-notice",
+    licenses: ["vndk-v28-libui.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libui.so"],
@@ -3674,7 +3674,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libvorbisidec.so-notice",
+    licenses: ["vndk-v28-libvorbisidec.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libvorbisidec.so"],
@@ -3713,7 +3713,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libxml2.so-notice",
+    licenses: ["vndk-v28-libxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libxml2.so"],
@@ -4088,7 +4088,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libblas.so-notice",
+    licenses: ["vndk-v28-libblas.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libblas.so"],
@@ -4109,7 +4109,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libc++.so-notice",
+    licenses: ["vndk-v28-libc++.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libc++.so"],
@@ -4131,7 +4131,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libcompiler_rt.so-notice",
+    licenses: ["vndk-v28-libcompiler_rt.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libcompiler_rt.so"],
@@ -4152,7 +4152,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcutils.so-notice",
+    licenses: ["vndk-v28-libcutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libcutils.so"],
@@ -4173,7 +4173,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhardware.so-notice",
+    licenses: ["vndk-v28-libhardware.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhardware.so"],
@@ -4254,7 +4254,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder.so-notice",
+    licenses: ["vndk-v28-libhwbinder.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhwbinder.so"],
@@ -4275,7 +4275,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v28-libhwbinder_noltopgo.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -4337,7 +4337,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libunwind.so-notice",
+    licenses: ["vndk-v28-libunwind.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libunwind.so"],
@@ -4378,7 +4378,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutils.so-notice",
+    licenses: ["vndk-v28-libutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libutils.so"],
@@ -4399,7 +4399,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutilscallstack.so-notice",
+    licenses: ["vndk-v28-libutilscallstack.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libutilscallstack.so"],
@@ -4420,7 +4420,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libz.so-notice",
+    licenses: ["vndk-v28-libz.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libz.so"],
diff --git a/common/Android.bp b/common/Android.bp
index e3ec25a..956fe94 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -21,342 +21,439 @@ package {
     default_applicable_licenses: ["prebuilts_vndk_v28_license"],
 }
 
-filegroup {
-    name: "vndk-v28-libaudioroute.so-notice",
-    srcs: ["NOTICE_FILES/libaudioroute.so.txt"],
+license {
+    name: "vndk-v28-libaudioroute.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libaudioroute.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libblas.so-notice",
-    srcs: ["NOTICE_FILES/libblas.so.txt"],
+license {
+    name: "vndk-v28-libblas.so-license",
+    license_kinds: ["legacy_notice"],
+    license_text: ["NOTICE_FILES/libblas.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libc++.so-notice",
-    srcs: ["NOTICE_FILES/libc++.so.txt"],
+license {
+    name: "vndk-v28-libc++.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-NCSA",
+    ],
+    license_text: ["NOTICE_FILES/libc++.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libcap.so-notice",
-    srcs: ["NOTICE_FILES/libcap.so.txt"],
+license {
+    name: "vndk-v28-libcap.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-GPL-2.0",
+    ],
+    license_text: ["NOTICE_FILES/libcap.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libcompiler_rt.so-notice",
-    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
+license {
+    name: "vndk-v28-libcompiler_rt.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-NCSA",
+    ],
+    license_text: ["NOTICE_FILES/libcompiler_rt.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libcrypto.so-notice",
-    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
+license {
+    name: "vndk-v28-libcrypto.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-OpenSSL",
+    ],
+    license_text: ["NOTICE_FILES/libcrypto.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libcurl.so-notice",
-    srcs: ["NOTICE_FILES/libcurl.so.txt"],
+license {
+    name: "vndk-v28-libcurl.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libcurl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libcutils.so-notice",
-    srcs: ["NOTICE_FILES/libcutils.so.txt"],
+license {
+    name: "vndk-v28-libcutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libcutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libevent.so-notice",
-    srcs: ["NOTICE_FILES/libevent.so.txt"],
+license {
+    name: "vndk-v28-libevent.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: ["NOTICE_FILES/libevent.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libexif.so-notice",
-    srcs: ["NOTICE_FILES/libexif.so.txt"],
+license {
+    name: "vndk-v28-libexif.so-license",
+    license_kinds: ["SPDX-license-identifier-LGPL-2.1"],
+    license_text: ["NOTICE_FILES/libexif.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libhardware.so-notice",
-    srcs: ["NOTICE_FILES/libhardware.so.txt"],
+license {
+    name: "vndk-v28-libhardware.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhardware.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libhardware_legacy.so-notice",
-    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
+license {
+    name: "vndk-v28-libhardware_legacy.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhardware_legacy.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libhwbinder.so-notice",
-    srcs: ["NOTICE_FILES/libhwbinder.so.txt"],
+license {
+    name: "vndk-v28-libhwbinder.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhwbinder.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libhwbinder_noltopgo.so-notice",
-    srcs: ["NOTICE_FILES/libhwbinder_noltopgo.so.txt"],
+license {
+    name: "vndk-v28-libhwbinder_noltopgo.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhwbinder_noltopgo.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libjpeg.so-notice",
-    srcs: ["NOTICE_FILES/libjpeg.so.txt"],
+license {
+    name: "vndk-v28-libjpeg.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-Zlib",
+    ],
+    license_text: ["NOTICE_FILES/libjpeg.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libkeymaster_messages.so-notice",
-    srcs: ["NOTICE_FILES/libkeymaster_messages.so.txt"],
+license {
+    name: "vndk-v28-libkeymaster_messages.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libkeymaster_messages.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libkeymaster_portable.so-notice",
-    srcs: ["NOTICE_FILES/libkeymaster_portable.so.txt"],
+license {
+    name: "vndk-v28-libkeymaster_portable.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libkeymaster_portable.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libldacBT_abr.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
+license {
+    name: "vndk-v28-libldacBT_abr.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: [
+        "NOTICE_FILES/libldacBT_abr.so.txt",
+        ":Apache-2.0-License-Text",
+    ],
 }
 
-filegroup {
-    name: "vndk-v28-libldacBT_enc.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
+license {
+    name: "vndk-v28-libldacBT_enc.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: [
+        "NOTICE_FILES/libldacBT_enc.so.txt",
+        ":Apache-2.0-License-Text",
+    ],
 }
 
-filegroup {
-    name: "vndk-v28-liblz4.so-notice",
-    srcs: ["NOTICE_FILES/liblz4.so.txt"],
+license {
+    name: "vndk-v28-liblz4.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/liblz4.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libmedia_helper.so-notice",
-    srcs: ["NOTICE_FILES/libmedia_helper.so.txt"],
+license {
+    name: "vndk-v28-libmedia_helper.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libmedia_helper.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libmedia_omx.so-notice",
-    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
+license {
+    name: "vndk-v28-libmedia_omx.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libmedia_omx.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libminijail.so-notice",
-    srcs: ["NOTICE_FILES/libminijail.so.txt"],
+license {
+    name: "vndk-v28-libminijail.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libminijail.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libnetutils.so-notice",
-    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
+license {
+    name: "vndk-v28-libnetutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libnetutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libnl.so-notice",
-    srcs: ["NOTICE_FILES/libnl.so.txt"],
+license {
+    name: "vndk-v28-libnl.so-license",
+    license_kinds: ["SPDX-license-identifier-LGPL-2.1"],
+    license_text: ["NOTICE_FILES/libnl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libopus.so-notice",
-    srcs: ["NOTICE_FILES/libopus.so.txt"],
+license {
+    name: "vndk-v28-libopus.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libopus.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libpagemap.so-notice",
-    srcs: ["NOTICE_FILES/libpagemap.so.txt"],
+license {
+    name: "vndk-v28-libpagemap.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libpagemap.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libpcre2.so-notice",
-    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
+license {
+    name: "vndk-v28-libpcre2.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libpcre2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libpiex.so-notice",
-    srcs: ["NOTICE_FILES/libpiex.so.txt"],
+license {
+    name: "vndk-v28-libpiex.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libpiex.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libpower.so-notice",
-    srcs: ["NOTICE_FILES/libpower.so.txt"],
+license {
+    name: "vndk-v28-libpower.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libpower.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libprotobuf-cpp-full.so-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-full.so.txt"],
+license {
+    name: "vndk-v28-libprotobuf-cpp-full.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libprotobuf-cpp-full.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libprotobuf-cpp-lite.so-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-lite.so.txt"],
+license {
+    name: "vndk-v28-libprotobuf-cpp-lite.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libprotobuf-cpp-lite.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libpuresoftkeymasterdevice.so-notice",
-    srcs: ["NOTICE_FILES/libpuresoftkeymasterdevice.so.txt"],
+license {
+    name: "vndk-v28-libpuresoftkeymasterdevice.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libpuresoftkeymasterdevice.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libsoftkeymasterdevice.so-notice",
-    srcs: ["NOTICE_FILES/libsoftkeymasterdevice.so.txt"],
+license {
+    name: "vndk-v28-libsoftkeymasterdevice.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libsoftkeymasterdevice.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libspeexresampler.so-notice",
-    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
+license {
+    name: "vndk-v28-libspeexresampler.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libspeexresampler.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libsqlite.so-notice",
-    srcs: ["NOTICE_FILES/libsqlite.so.txt"],
+license {
+    name: "vndk-v28-libsqlite.so-license",
+    license_kinds: ["legacy_permissive"],
+    license_text: ["NOTICE_FILES/libsqlite.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libssl.so-notice",
-    srcs: ["NOTICE_FILES/libssl.so.txt"],
+license {
+    name: "vndk-v28-libssl.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-OpenSSL",
+    ],
+    license_text: ["NOTICE_FILES/libssl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_amrnb_common.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_amrnb_common.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_amrnb_common.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_amrnb_common.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_enc_common.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_enc_common.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_enc_common.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_enc_common.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_flacdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_flacdec.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_flacdec.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_flacdec.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_foundation.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_foundation.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_omx.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_omx.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_omx.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_omx_utils.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_omx_utils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_aacdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_aacdec.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_aacdec.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_aacdec.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_aacenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_aacenc.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_aacenc.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_aacenc.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_amrdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrdec.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_amrdec.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_amrdec.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_amrnbenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_amrnbenc.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_amrnbenc.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_amrwbenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_amrwbenc.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_amrwbenc.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_flacdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_flacdec.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_flacdec.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_flacdec.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_flacenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_flacenc.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_flacenc.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_flacenc.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_g711dec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_g711dec.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_g711dec.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_g711dec.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_gsmdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_gsmdec.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_gsmdec.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_gsmdec.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_mp3dec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mp3dec.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_mp3dec.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_mp3dec.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_mpeg4dec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_mpeg4dec.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_mpeg4dec.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_mpeg4enc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_mpeg4enc.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_mpeg4enc.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_rawdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_rawdec.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_rawdec.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_rawdec.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_vorbisdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_vorbisdec.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_vorbisdec.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_vpxdec.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vpxdec.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_vpxdec.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_vpxdec.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libstagefright_soft_vpxenc.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_soft_vpxenc.so.txt"],
+license {
+    name: "vndk-v28-libstagefright_soft_vpxenc.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_soft_vpxenc.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libtinyalsa.so-notice",
-    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
+license {
+    name: "vndk-v28-libtinyalsa.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libtinyalsa.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libtinyxml2.so-notice",
-    srcs: ["NOTICE_FILES/libtinyxml2.so.txt"],
+license {
+    name: "vndk-v28-libtinyxml2.so-license",
+    license_kinds: ["SPDX-license-identifier-Zlib"],
+    license_text: ["NOTICE_FILES/libtinyxml2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libui.so-notice",
-    srcs: ["NOTICE_FILES/libui.so.txt"],
+license {
+    name: "vndk-v28-libui.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libui.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libunwind.so-notice",
-    srcs: ["NOTICE_FILES/libunwind.so.txt"],
+license {
+    name: "vndk-v28-libunwind.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libunwind.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libutils.so-notice",
-    srcs: ["NOTICE_FILES/libutils.so.txt"],
+license {
+    name: "vndk-v28-libutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libutilscallstack.so-notice",
-    srcs: ["NOTICE_FILES/libutilscallstack.so.txt"],
+license {
+    name: "vndk-v28-libutilscallstack.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libutilscallstack.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libvorbisidec.so-notice",
-    srcs: ["NOTICE_FILES/libvorbisidec.so.txt"],
+license {
+    name: "vndk-v28-libvorbisidec.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libvorbisidec.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libxml2.so-notice",
-    srcs: ["NOTICE_FILES/libxml2.so.txt"],
+license {
+    name: "vndk-v28-libxml2.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libxml2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v28-libz.so-notice",
-    srcs: ["NOTICE_FILES/libz.so.txt"],
+license {
+    name: "vndk-v28-libz.so-license",
+    license_kinds: ["SPDX-license-identifier-Zlib"],
+    license_text: ["NOTICE_FILES/libz.so.txt"],
 }
diff --git a/x86/Android.bp b/x86/Android.bp
index 8267527..8263fd2 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -1726,7 +1726,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libaudioroute.so-notice",
+    licenses: ["vndk-v28-libaudioroute.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libaudioroute.so"],
@@ -1791,7 +1791,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcap.so-notice",
+    licenses: ["vndk-v28-libcap.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcap.so"],
@@ -1824,7 +1824,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcrypto.so-notice",
+    licenses: ["vndk-v28-libcrypto.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcrypto.so"],
@@ -1857,7 +1857,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcurl.so-notice",
+    licenses: ["vndk-v28-libcurl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcurl.so"],
@@ -1906,7 +1906,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libevent.so-notice",
+    licenses: ["vndk-v28-libevent.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libevent.so"],
@@ -1923,7 +1923,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libexif.so-notice",
+    licenses: ["vndk-v28-libexif.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libexif.so"],
@@ -2005,7 +2005,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libhardware_legacy.so-notice",
+    licenses: ["vndk-v28-libhardware_legacy.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libhardware_legacy.so"],
@@ -2054,7 +2054,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libjpeg.so-notice",
+    licenses: ["vndk-v28-libjpeg.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libjpeg.so"],
@@ -2071,7 +2071,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v28-libkeymaster_messages.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_messages.so"],
@@ -2088,7 +2088,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v28-libkeymaster_portable.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_portable.so"],
@@ -2105,7 +2105,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_abr.so-notice",
+    licenses: ["vndk-v28-libldacBT_abr.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_abr.so"],
@@ -2122,7 +2122,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_enc.so-notice",
+    licenses: ["vndk-v28-libldacBT_enc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_enc.so"],
@@ -2139,7 +2139,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-liblz4.so-notice",
+    licenses: ["vndk-v28-liblz4.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/liblz4.so"],
@@ -2156,7 +2156,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_helper.so-notice",
+    licenses: ["vndk-v28-libmedia_helper.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_helper.so"],
@@ -2173,7 +2173,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_omx.so-notice",
+    licenses: ["vndk-v28-libmedia_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_omx.so"],
@@ -2206,7 +2206,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libminijail.so-notice",
+    licenses: ["vndk-v28-libminijail.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libminijail.so"],
@@ -2239,7 +2239,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnetutils.so-notice",
+    licenses: ["vndk-v28-libnetutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnetutils.so"],
@@ -2256,7 +2256,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnl.so-notice",
+    licenses: ["vndk-v28-libnl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnl.so"],
@@ -2273,7 +2273,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libopus.so-notice",
+    licenses: ["vndk-v28-libopus.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libopus.so"],
@@ -2290,7 +2290,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpagemap.so-notice",
+    licenses: ["vndk-v28-libpagemap.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpagemap.so"],
@@ -2307,7 +2307,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpcre2.so-notice",
+    licenses: ["vndk-v28-libpcre2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpcre2.so"],
@@ -2324,7 +2324,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpiex.so-notice",
+    licenses: ["vndk-v28-libpiex.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpiex.so"],
@@ -2357,7 +2357,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpower.so-notice",
+    licenses: ["vndk-v28-libpower.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpower.so"],
@@ -2390,7 +2390,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v28-libprotobuf-cpp-full.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2407,7 +2407,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v28-libprotobuf-cpp-lite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2424,7 +2424,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v28-libpuresoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -2473,7 +2473,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v28-libsoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2490,7 +2490,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libspeexresampler.so-notice",
+    licenses: ["vndk-v28-libspeexresampler.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libspeexresampler.so"],
@@ -2507,7 +2507,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsqlite.so-notice",
+    licenses: ["vndk-v28-libsqlite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsqlite.so"],
@@ -2524,7 +2524,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libssl.so-notice",
+    licenses: ["vndk-v28-libssl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libssl.so"],
@@ -2541,7 +2541,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_amrnb_common.so-notice",
+    licenses: ["vndk-v28-libstagefright_amrnb_common.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -2574,7 +2574,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_enc_common.so-notice",
+    licenses: ["vndk-v28-libstagefright_enc_common.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_enc_common.so"],
@@ -2591,7 +2591,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_flacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_flacdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_flacdec.so"],
@@ -2608,7 +2608,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v28-libstagefright_foundation.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_foundation.so"],
@@ -2625,7 +2625,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx.so-notice",
+    licenses: ["vndk-v28-libstagefright_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx.so"],
@@ -2642,7 +2642,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v28-libstagefright_omx_utils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -2659,7 +2659,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_aacdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -2676,7 +2676,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_aacenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -2693,7 +2693,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -2710,7 +2710,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrnbenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrnbenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -2727,7 +2727,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrwbenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrwbenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -2776,7 +2776,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_flacdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -2793,7 +2793,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_flacenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -2810,7 +2810,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_g711dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_g711dec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -2827,7 +2827,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_gsmdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_gsmdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -2860,7 +2860,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mp3dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mp3dec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -2893,7 +2893,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mpeg4dec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -2910,7 +2910,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4enc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mpeg4enc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -2943,7 +2943,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_rawdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_rawdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -2960,7 +2960,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vorbisdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vorbisdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -2977,7 +2977,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vpxdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -2994,7 +2994,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vpxenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -3059,7 +3059,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyalsa.so-notice",
+    licenses: ["vndk-v28-libtinyalsa.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyalsa.so"],
@@ -3076,7 +3076,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyxml2.so-notice",
+    licenses: ["vndk-v28-libtinyxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyxml2.so"],
@@ -3093,7 +3093,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libui.so-notice",
+    licenses: ["vndk-v28-libui.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libui.so"],
@@ -3158,7 +3158,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libvorbisidec.so-notice",
+    licenses: ["vndk-v28-libvorbisidec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libvorbisidec.so"],
@@ -3191,7 +3191,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libxml2.so-notice",
+    licenses: ["vndk-v28-libxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libxml2.so"],
@@ -3498,7 +3498,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libblas.so-notice",
+    licenses: ["vndk-v28-libblas.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libblas.so"],
@@ -3516,7 +3516,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libc++.so-notice",
+    licenses: ["vndk-v28-libc++.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libc++.so"],
@@ -3535,7 +3535,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libcompiler_rt.so-notice",
+    licenses: ["vndk-v28-libcompiler_rt.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcompiler_rt.so"],
@@ -3553,7 +3553,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcutils.so-notice",
+    licenses: ["vndk-v28-libcutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcutils.so"],
@@ -3571,7 +3571,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhardware.so-notice",
+    licenses: ["vndk-v28-libhardware.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhardware.so"],
@@ -3640,7 +3640,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder.so-notice",
+    licenses: ["vndk-v28-libhwbinder.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder.so"],
@@ -3658,7 +3658,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v28-libhwbinder_noltopgo.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -3711,7 +3711,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libunwind.so-notice",
+    licenses: ["vndk-v28-libunwind.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libunwind.so"],
@@ -3746,7 +3746,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutils.so-notice",
+    licenses: ["vndk-v28-libutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutils.so"],
@@ -3764,7 +3764,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutilscallstack.so-notice",
+    licenses: ["vndk-v28-libutilscallstack.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutilscallstack.so"],
@@ -3782,7 +3782,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libz.so-notice",
+    licenses: ["vndk-v28-libz.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libz.so"],
diff --git a/x86/binder32/Android.bp b/x86/binder32/Android.bp
index 8622abe..0d7efc4 100644
--- a/x86/binder32/Android.bp
+++ b/x86/binder32/Android.bp
@@ -1834,7 +1834,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libaudioroute.so-notice",
+    licenses: ["vndk-v28-libaudioroute.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libaudioroute.so"],
@@ -1903,7 +1903,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcap.so-notice",
+    licenses: ["vndk-v28-libcap.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcap.so"],
@@ -1938,7 +1938,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcrypto.so-notice",
+    licenses: ["vndk-v28-libcrypto.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcrypto.so"],
@@ -1973,7 +1973,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcurl.so-notice",
+    licenses: ["vndk-v28-libcurl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcurl.so"],
@@ -2025,7 +2025,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libevent.so-notice",
+    licenses: ["vndk-v28-libevent.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libevent.so"],
@@ -2043,7 +2043,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libexif.so-notice",
+    licenses: ["vndk-v28-libexif.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libexif.so"],
@@ -2130,7 +2130,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libhardware_legacy.so-notice",
+    licenses: ["vndk-v28-libhardware_legacy.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libhardware_legacy.so"],
@@ -2182,7 +2182,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libjpeg.so-notice",
+    licenses: ["vndk-v28-libjpeg.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libjpeg.so"],
@@ -2200,7 +2200,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v28-libkeymaster_messages.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_messages.so"],
@@ -2218,7 +2218,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v28-libkeymaster_portable.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_portable.so"],
@@ -2236,7 +2236,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_abr.so-notice",
+    licenses: ["vndk-v28-libldacBT_abr.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_abr.so"],
@@ -2254,7 +2254,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_enc.so-notice",
+    licenses: ["vndk-v28-libldacBT_enc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_enc.so"],
@@ -2272,7 +2272,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-liblz4.so-notice",
+    licenses: ["vndk-v28-liblz4.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/liblz4.so"],
@@ -2290,7 +2290,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_helper.so-notice",
+    licenses: ["vndk-v28-libmedia_helper.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_helper.so"],
@@ -2308,7 +2308,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_omx.so-notice",
+    licenses: ["vndk-v28-libmedia_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_omx.so"],
@@ -2343,7 +2343,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libminijail.so-notice",
+    licenses: ["vndk-v28-libminijail.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libminijail.so"],
@@ -2378,7 +2378,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnetutils.so-notice",
+    licenses: ["vndk-v28-libnetutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnetutils.so"],
@@ -2396,7 +2396,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnl.so-notice",
+    licenses: ["vndk-v28-libnl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnl.so"],
@@ -2414,7 +2414,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libopus.so-notice",
+    licenses: ["vndk-v28-libopus.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libopus.so"],
@@ -2432,7 +2432,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpagemap.so-notice",
+    licenses: ["vndk-v28-libpagemap.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpagemap.so"],
@@ -2450,7 +2450,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpcre2.so-notice",
+    licenses: ["vndk-v28-libpcre2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpcre2.so"],
@@ -2468,7 +2468,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpiex.so-notice",
+    licenses: ["vndk-v28-libpiex.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpiex.so"],
@@ -2503,7 +2503,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpower.so-notice",
+    licenses: ["vndk-v28-libpower.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpower.so"],
@@ -2538,7 +2538,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v28-libprotobuf-cpp-full.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2556,7 +2556,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v28-libprotobuf-cpp-lite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2574,7 +2574,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v28-libpuresoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -2626,7 +2626,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v28-libsoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2644,7 +2644,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libspeexresampler.so-notice",
+    licenses: ["vndk-v28-libspeexresampler.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libspeexresampler.so"],
@@ -2662,7 +2662,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsqlite.so-notice",
+    licenses: ["vndk-v28-libsqlite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsqlite.so"],
@@ -2680,7 +2680,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libssl.so-notice",
+    licenses: ["vndk-v28-libssl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libssl.so"],
@@ -2698,7 +2698,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_amrnb_common.so-notice",
+    licenses: ["vndk-v28-libstagefright_amrnb_common.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -2733,7 +2733,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_enc_common.so-notice",
+    licenses: ["vndk-v28-libstagefright_enc_common.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_enc_common.so"],
@@ -2751,7 +2751,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_flacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_flacdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_flacdec.so"],
@@ -2769,7 +2769,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v28-libstagefright_foundation.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_foundation.so"],
@@ -2787,7 +2787,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx.so-notice",
+    licenses: ["vndk-v28-libstagefright_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx.so"],
@@ -2805,7 +2805,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v28-libstagefright_omx_utils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -2823,7 +2823,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_aacdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -2841,7 +2841,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_aacenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -2859,7 +2859,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -2877,7 +2877,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrnbenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrnbenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -2895,7 +2895,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrwbenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrwbenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -2947,7 +2947,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_flacdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -2965,7 +2965,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_flacenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -2983,7 +2983,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_g711dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_g711dec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -3001,7 +3001,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_gsmdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_gsmdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -3036,7 +3036,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mp3dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mp3dec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -3071,7 +3071,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mpeg4dec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -3089,7 +3089,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4enc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mpeg4enc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -3124,7 +3124,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_rawdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_rawdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -3142,7 +3142,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vorbisdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vorbisdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -3160,7 +3160,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vpxdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -3178,7 +3178,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vpxenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -3247,7 +3247,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyalsa.so-notice",
+    licenses: ["vndk-v28-libtinyalsa.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyalsa.so"],
@@ -3265,7 +3265,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyxml2.so-notice",
+    licenses: ["vndk-v28-libtinyxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyxml2.so"],
@@ -3283,7 +3283,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libui.so-notice",
+    licenses: ["vndk-v28-libui.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libui.so"],
@@ -3352,7 +3352,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libvorbisidec.so-notice",
+    licenses: ["vndk-v28-libvorbisidec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libvorbisidec.so"],
@@ -3387,7 +3387,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libxml2.so-notice",
+    licenses: ["vndk-v28-libxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libxml2.so"],
@@ -3712,7 +3712,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libblas.so-notice",
+    licenses: ["vndk-v28-libblas.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libblas.so"],
@@ -3731,7 +3731,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libc++.so-notice",
+    licenses: ["vndk-v28-libc++.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libc++.so"],
@@ -3751,7 +3751,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libcompiler_rt.so-notice",
+    licenses: ["vndk-v28-libcompiler_rt.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcompiler_rt.so"],
@@ -3770,7 +3770,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcutils.so-notice",
+    licenses: ["vndk-v28-libcutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcutils.so"],
@@ -3789,7 +3789,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhardware.so-notice",
+    licenses: ["vndk-v28-libhardware.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhardware.so"],
@@ -3862,7 +3862,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder.so-notice",
+    licenses: ["vndk-v28-libhwbinder.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder.so"],
@@ -3881,7 +3881,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v28-libhwbinder_noltopgo.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -3937,7 +3937,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libunwind.so-notice",
+    licenses: ["vndk-v28-libunwind.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libunwind.so"],
@@ -3974,7 +3974,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutils.so-notice",
+    licenses: ["vndk-v28-libutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutils.so"],
@@ -3993,7 +3993,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutilscallstack.so-notice",
+    licenses: ["vndk-v28-libutilscallstack.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutilscallstack.so"],
@@ -4012,7 +4012,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libz.so-notice",
+    licenses: ["vndk-v28-libz.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libz.so"],
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index fddda87..6dd7798 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -2047,7 +2047,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libaudioroute.so-notice",
+    licenses: ["vndk-v28-libaudioroute.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libaudioroute.so"],
@@ -2124,7 +2124,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcap.so-notice",
+    licenses: ["vndk-v28-libcap.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcap.so"],
@@ -2163,7 +2163,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcrypto.so-notice",
+    licenses: ["vndk-v28-libcrypto.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcrypto.so"],
@@ -2202,7 +2202,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libcurl.so-notice",
+    licenses: ["vndk-v28-libcurl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcurl.so"],
@@ -2260,7 +2260,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libevent.so-notice",
+    licenses: ["vndk-v28-libevent.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libevent.so"],
@@ -2280,7 +2280,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libexif.so-notice",
+    licenses: ["vndk-v28-libexif.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libexif.so"],
@@ -2377,7 +2377,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libhardware_legacy.so-notice",
+    licenses: ["vndk-v28-libhardware_legacy.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libhardware_legacy.so"],
@@ -2435,7 +2435,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libjpeg.so-notice",
+    licenses: ["vndk-v28-libjpeg.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libjpeg.so"],
@@ -2455,7 +2455,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v28-libkeymaster_messages.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libkeymaster_messages.so"],
@@ -2475,7 +2475,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v28-libkeymaster_portable.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libkeymaster_portable.so"],
@@ -2495,7 +2495,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_abr.so-notice",
+    licenses: ["vndk-v28-libldacBT_abr.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libldacBT_abr.so"],
@@ -2515,7 +2515,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libldacBT_enc.so-notice",
+    licenses: ["vndk-v28-libldacBT_enc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libldacBT_enc.so"],
@@ -2535,7 +2535,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-liblz4.so-notice",
+    licenses: ["vndk-v28-liblz4.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/liblz4.so"],
@@ -2555,7 +2555,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_helper.so-notice",
+    licenses: ["vndk-v28-libmedia_helper.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libmedia_helper.so"],
@@ -2575,7 +2575,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libmedia_omx.so-notice",
+    licenses: ["vndk-v28-libmedia_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libmedia_omx.so"],
@@ -2614,7 +2614,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libminijail.so-notice",
+    licenses: ["vndk-v28-libminijail.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libminijail.so"],
@@ -2653,7 +2653,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnetutils.so-notice",
+    licenses: ["vndk-v28-libnetutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libnetutils.so"],
@@ -2673,7 +2673,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libnl.so-notice",
+    licenses: ["vndk-v28-libnl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libnl.so"],
@@ -2693,7 +2693,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libopus.so-notice",
+    licenses: ["vndk-v28-libopus.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libopus.so"],
@@ -2713,7 +2713,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpagemap.so-notice",
+    licenses: ["vndk-v28-libpagemap.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpagemap.so"],
@@ -2733,7 +2733,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpcre2.so-notice",
+    licenses: ["vndk-v28-libpcre2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpcre2.so"],
@@ -2753,7 +2753,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpiex.so-notice",
+    licenses: ["vndk-v28-libpiex.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpiex.so"],
@@ -2792,7 +2792,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpower.so-notice",
+    licenses: ["vndk-v28-libpower.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpower.so"],
@@ -2831,7 +2831,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v28-libprotobuf-cpp-full.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -2851,7 +2851,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v28-libprotobuf-cpp-lite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -2871,7 +2871,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v28-libpuresoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -2929,7 +2929,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v28-libsoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -2949,7 +2949,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libspeexresampler.so-notice",
+    licenses: ["vndk-v28-libspeexresampler.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libspeexresampler.so"],
@@ -2969,7 +2969,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libsqlite.so-notice",
+    licenses: ["vndk-v28-libsqlite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libsqlite.so"],
@@ -2989,7 +2989,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libssl.so-notice",
+    licenses: ["vndk-v28-libssl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libssl.so"],
@@ -3009,7 +3009,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_amrnb_common.so-notice",
+    licenses: ["vndk-v28-libstagefright_amrnb_common.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_amrnb_common.so"],
@@ -3048,7 +3048,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_enc_common.so-notice",
+    licenses: ["vndk-v28-libstagefright_enc_common.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_enc_common.so"],
@@ -3068,7 +3068,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_flacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_flacdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_flacdec.so"],
@@ -3088,7 +3088,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v28-libstagefright_foundation.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_foundation.so"],
@@ -3108,7 +3108,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx.so-notice",
+    licenses: ["vndk-v28-libstagefright_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_omx.so"],
@@ -3128,7 +3128,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v28-libstagefright_omx_utils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -3148,7 +3148,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_aacdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_aacdec.so"],
@@ -3165,7 +3165,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_aacenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_aacenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_aacenc.so"],
@@ -3182,7 +3182,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_amrdec.so"],
@@ -3199,7 +3199,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrnbenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrnbenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_amrnbenc.so"],
@@ -3216,7 +3216,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_amrwbenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_amrwbenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_amrwbenc.so"],
@@ -3265,7 +3265,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_flacdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_flacdec.so"],
@@ -3282,7 +3282,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_flacenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_flacenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_flacenc.so"],
@@ -3299,7 +3299,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_g711dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_g711dec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_g711dec.so"],
@@ -3316,7 +3316,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_gsmdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_gsmdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_gsmdec.so"],
@@ -3349,7 +3349,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mp3dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mp3dec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_mp3dec.so"],
@@ -3382,7 +3382,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4dec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mpeg4dec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_mpeg4dec.so"],
@@ -3399,7 +3399,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_mpeg4enc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_mpeg4enc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_mpeg4enc.so"],
@@ -3432,7 +3432,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_rawdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_rawdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_rawdec.so"],
@@ -3449,7 +3449,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vorbisdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vorbisdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_vorbisdec.so"],
@@ -3466,7 +3466,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxdec.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vpxdec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_vpxdec.so"],
@@ -3483,7 +3483,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libstagefright_soft_vpxenc.so-notice",
+    licenses: ["vndk-v28-libstagefright_soft_vpxenc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_soft_vpxenc.so"],
@@ -3557,7 +3557,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyalsa.so-notice",
+    licenses: ["vndk-v28-libtinyalsa.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libtinyalsa.so"],
@@ -3577,7 +3577,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libtinyxml2.so-notice",
+    licenses: ["vndk-v28-libtinyxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libtinyxml2.so"],
@@ -3597,7 +3597,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libui.so-notice",
+    licenses: ["vndk-v28-libui.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libui.so"],
@@ -3674,7 +3674,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libvorbisidec.so-notice",
+    licenses: ["vndk-v28-libvorbisidec.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libvorbisidec.so"],
@@ -3713,7 +3713,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v28-libxml2.so-notice",
+    licenses: ["vndk-v28-libxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libxml2.so"],
@@ -4088,7 +4088,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libblas.so-notice",
+    licenses: ["vndk-v28-libblas.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libblas.so"],
@@ -4109,7 +4109,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libc++.so-notice",
+    licenses: ["vndk-v28-libc++.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libc++.so"],
@@ -4131,7 +4131,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libcompiler_rt.so-notice",
+    licenses: ["vndk-v28-libcompiler_rt.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libcompiler_rt.so"],
@@ -4152,7 +4152,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libcutils.so-notice",
+    licenses: ["vndk-v28-libcutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libcutils.so"],
@@ -4173,7 +4173,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhardware.so-notice",
+    licenses: ["vndk-v28-libhardware.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libhardware.so"],
@@ -4254,7 +4254,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder.so-notice",
+    licenses: ["vndk-v28-libhwbinder.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libhwbinder.so"],
@@ -4275,7 +4275,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v28-libhwbinder_noltopgo.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -4337,7 +4337,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v28-libunwind.so-notice",
+    licenses: ["vndk-v28-libunwind.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libunwind.so"],
@@ -4378,7 +4378,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutils.so-notice",
+    licenses: ["vndk-v28-libutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libutils.so"],
@@ -4399,7 +4399,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libutilscallstack.so-notice",
+    licenses: ["vndk-v28-libutilscallstack.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libutilscallstack.so"],
@@ -4420,7 +4420,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v28-libz.so-notice",
+    licenses: ["vndk-v28-libz.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libz.so"],