diff --git a/arm/Android.bp b/arm/Android.bp
index 049c482..591d51f 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -2420,7 +2420,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libaudioroute.so-notice",
+    licenses: ["vndk-v29-libaudioroute.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so"],
@@ -2485,7 +2485,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcap.so-notice",
+    licenses: ["vndk-v29-libcap.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcap.so"],
@@ -2582,7 +2582,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcrypto.so-notice",
+    licenses: ["vndk-v29-libcrypto.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so"],
@@ -2615,7 +2615,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcurl.so-notice",
+    licenses: ["vndk-v29-libcurl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so"],
@@ -2664,7 +2664,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libevent.so-notice",
+    licenses: ["vndk-v29-libevent.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libevent.so"],
@@ -2681,7 +2681,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexif.so-notice",
+    licenses: ["vndk-v29-libexif.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexif.so"],
@@ -2698,7 +2698,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexpat.so-notice",
+    licenses: ["vndk-v29-libexpat.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so"],
@@ -2764,7 +2764,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libhardware_legacy.so-notice",
+    licenses: ["vndk-v29-libhardware_legacy.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so"],
@@ -2813,7 +2813,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libjpeg.so-notice",
+    licenses: ["vndk-v29-libjpeg.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so"],
@@ -2830,7 +2830,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v29-libkeymaster_messages.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so"],
@@ -2847,7 +2847,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v29-libkeymaster_portable.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so"],
@@ -2864,7 +2864,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_abr.so-notice",
+    licenses: ["vndk-v29-libldacBT_abr.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so"],
@@ -2881,7 +2881,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_enc.so-notice",
+    licenses: ["vndk-v29-libldacBT_enc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so"],
@@ -2898,7 +2898,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-liblz4.so-notice",
+    licenses: ["vndk-v29-liblz4.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so"],
@@ -2915,7 +2915,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_helper.so-notice",
+    licenses: ["vndk-v29-libmedia_helper.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so"],
@@ -2932,7 +2932,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_omx.so-notice",
+    licenses: ["vndk-v29-libmedia_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so"],
@@ -2965,7 +2965,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libminijail.so-notice",
+    licenses: ["vndk-v29-libminijail.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so"],
@@ -2998,7 +2998,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnetutils.so-notice",
+    licenses: ["vndk-v29-libnetutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so"],
@@ -3015,7 +3015,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnl.so-notice",
+    licenses: ["vndk-v29-libnl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnl.so"],
@@ -3032,7 +3032,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpcre2.so-notice",
+    licenses: ["vndk-v29-libpcre2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so"],
@@ -3049,7 +3049,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpiex.so-notice",
+    licenses: ["vndk-v29-libpiex.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so"],
@@ -3082,7 +3082,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpower.so-notice",
+    licenses: ["vndk-v29-libpower.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpower.so"],
@@ -3115,7 +3115,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-full.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -3132,7 +3132,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-lite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -3149,7 +3149,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libpuresoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -3198,7 +3198,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libsoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -3215,7 +3215,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libspeexresampler.so-notice",
+    licenses: ["vndk-v29-libspeexresampler.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so"],
@@ -3232,7 +3232,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsqlite.so-notice",
+    licenses: ["vndk-v29-libsqlite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so"],
@@ -3249,7 +3249,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libssl.so-notice",
+    licenses: ["vndk-v29-libssl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libssl.so"],
@@ -3298,7 +3298,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v29-libstagefright_foundation.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so"],
@@ -3315,7 +3315,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so"],
@@ -3332,7 +3332,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx_utils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -3381,7 +3381,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyalsa.so-notice",
+    licenses: ["vndk-v29-libtinyalsa.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so"],
@@ -3398,7 +3398,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyxml2.so-notice",
+    licenses: ["vndk-v29-libtinyxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so"],
@@ -3415,7 +3415,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libui.so-notice",
+    licenses: ["vndk-v29-libui.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libui.so"],
@@ -3464,7 +3464,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libxml2.so-notice",
+    licenses: ["vndk-v29-libxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so"],
@@ -3824,7 +3824,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libblas.so-notice",
+    licenses: ["vndk-v29-libblas.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so"],
@@ -3842,7 +3842,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libc++.so-notice",
+    licenses: ["vndk-v29-libc++.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so"],
@@ -3861,7 +3861,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libcompiler_rt.so-notice",
+    licenses: ["vndk-v29-libcompiler_rt.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"],
@@ -3879,7 +3879,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libcutils.so-notice",
+    licenses: ["vndk-v29-libcutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so"],
@@ -3897,7 +3897,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhardware.so-notice",
+    licenses: ["vndk-v29-libhardware.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so"],
@@ -3915,7 +3915,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidlbase.so-notice",
+    licenses: ["vndk-v29-libhidlbase.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so"],
@@ -3950,7 +3950,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidltransport.so-notice",
+    licenses: ["vndk-v29-libhidltransport.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so"],
@@ -3968,7 +3968,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder.so-notice",
+    licenses: ["vndk-v29-libhwbinder.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so"],
@@ -3986,7 +3986,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v29-libhwbinder_noltopgo.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -4089,7 +4089,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutils.so-notice",
+    licenses: ["vndk-v29-libutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so"],
@@ -4107,7 +4107,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutilscallstack.so-notice",
+    licenses: ["vndk-v29-libutilscallstack.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so"],
@@ -4125,7 +4125,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libz.so-notice",
+    licenses: ["vndk-v29-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 a19e038..4fd5c36 100644
--- a/arm/binder32/Android.bp
+++ b/arm/binder32/Android.bp
@@ -2565,7 +2565,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libaudioroute.so-notice",
+    licenses: ["vndk-v29-libaudioroute.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so"],
@@ -2634,7 +2634,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcap.so-notice",
+    licenses: ["vndk-v29-libcap.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcap.so"],
@@ -2737,7 +2737,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcrypto.so-notice",
+    licenses: ["vndk-v29-libcrypto.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcrypto.so"],
@@ -2772,7 +2772,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcurl.so-notice",
+    licenses: ["vndk-v29-libcurl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so"],
@@ -2824,7 +2824,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libevent.so-notice",
+    licenses: ["vndk-v29-libevent.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libevent.so"],
@@ -2842,7 +2842,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexif.so-notice",
+    licenses: ["vndk-v29-libexif.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexif.so"],
@@ -2860,7 +2860,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexpat.so-notice",
+    licenses: ["vndk-v29-libexpat.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so"],
@@ -2930,7 +2930,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libhardware_legacy.so-notice",
+    licenses: ["vndk-v29-libhardware_legacy.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so"],
@@ -2982,7 +2982,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libjpeg.so-notice",
+    licenses: ["vndk-v29-libjpeg.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so"],
@@ -3000,7 +3000,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v29-libkeymaster_messages.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_messages.so"],
@@ -3018,7 +3018,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v29-libkeymaster_portable.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libkeymaster_portable.so"],
@@ -3036,7 +3036,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_abr.so-notice",
+    licenses: ["vndk-v29-libldacBT_abr.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_abr.so"],
@@ -3054,7 +3054,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_enc.so-notice",
+    licenses: ["vndk-v29-libldacBT_enc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libldacBT_enc.so"],
@@ -3072,7 +3072,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-liblz4.so-notice",
+    licenses: ["vndk-v29-liblz4.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so"],
@@ -3090,7 +3090,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_helper.so-notice",
+    licenses: ["vndk-v29-libmedia_helper.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so"],
@@ -3108,7 +3108,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_omx.so-notice",
+    licenses: ["vndk-v29-libmedia_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libmedia_omx.so"],
@@ -3143,7 +3143,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libminijail.so-notice",
+    licenses: ["vndk-v29-libminijail.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libminijail.so"],
@@ -3178,7 +3178,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnetutils.so-notice",
+    licenses: ["vndk-v29-libnetutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnetutils.so"],
@@ -3196,7 +3196,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnl.so-notice",
+    licenses: ["vndk-v29-libnl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnl.so"],
@@ -3214,7 +3214,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpcre2.so-notice",
+    licenses: ["vndk-v29-libpcre2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so"],
@@ -3232,7 +3232,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpiex.so-notice",
+    licenses: ["vndk-v29-libpiex.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so"],
@@ -3267,7 +3267,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpower.so-notice",
+    licenses: ["vndk-v29-libpower.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpower.so"],
@@ -3302,7 +3302,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-full.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -3320,7 +3320,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-lite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -3338,7 +3338,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libpuresoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -3390,7 +3390,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libsoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -3408,7 +3408,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libspeexresampler.so-notice",
+    licenses: ["vndk-v29-libspeexresampler.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libspeexresampler.so"],
@@ -3426,7 +3426,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsqlite.so-notice",
+    licenses: ["vndk-v29-libsqlite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so"],
@@ -3444,7 +3444,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libssl.so-notice",
+    licenses: ["vndk-v29-libssl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libssl.so"],
@@ -3496,7 +3496,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v29-libstagefright_foundation.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_foundation.so"],
@@ -3514,7 +3514,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx.so"],
@@ -3532,7 +3532,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx_utils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -3584,7 +3584,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyalsa.so-notice",
+    licenses: ["vndk-v29-libtinyalsa.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so"],
@@ -3602,7 +3602,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyxml2.so-notice",
+    licenses: ["vndk-v29-libtinyxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so"],
@@ -3620,7 +3620,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libui.so-notice",
+    licenses: ["vndk-v29-libui.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libui.so"],
@@ -3672,7 +3672,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libxml2.so-notice",
+    licenses: ["vndk-v29-libxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libxml2.so"],
@@ -4053,7 +4053,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libblas.so-notice",
+    licenses: ["vndk-v29-libblas.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libblas.so"],
@@ -4072,7 +4072,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libc++.so-notice",
+    licenses: ["vndk-v29-libc++.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libc++.so"],
@@ -4092,7 +4092,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libcompiler_rt.so-notice",
+    licenses: ["vndk-v29-libcompiler_rt.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"],
@@ -4111,7 +4111,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libcutils.so-notice",
+    licenses: ["vndk-v29-libcutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcutils.so"],
@@ -4130,7 +4130,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhardware.so-notice",
+    licenses: ["vndk-v29-libhardware.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhardware.so"],
@@ -4149,7 +4149,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidlbase.so-notice",
+    licenses: ["vndk-v29-libhidlbase.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so"],
@@ -4186,7 +4186,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidltransport.so-notice",
+    licenses: ["vndk-v29-libhidltransport.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhidltransport.so"],
@@ -4205,7 +4205,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder.so-notice",
+    licenses: ["vndk-v29-libhwbinder.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder.so"],
@@ -4224,7 +4224,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v29-libhwbinder_noltopgo.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -4333,7 +4333,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutils.so-notice",
+    licenses: ["vndk-v29-libutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutils.so"],
@@ -4352,7 +4352,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutilscallstack.so-notice",
+    licenses: ["vndk-v29-libutilscallstack.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libutilscallstack.so"],
@@ -4371,7 +4371,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libz.so-notice",
+    licenses: ["vndk-v29-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 81b6667..330a0ad 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -2870,7 +2870,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libaudioroute.so-notice",
+    licenses: ["vndk-v29-libaudioroute.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libaudioroute.so"],
@@ -2947,7 +2947,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcap.so-notice",
+    licenses: ["vndk-v29-libcap.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcap.so"],
@@ -3101,7 +3101,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcrypto.so-notice",
+    licenses: ["vndk-v29-libcrypto.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcrypto.so"],
@@ -3140,7 +3140,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcurl.so-notice",
+    licenses: ["vndk-v29-libcurl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcurl.so"],
@@ -3198,7 +3198,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libevent.so-notice",
+    licenses: ["vndk-v29-libevent.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libevent.so"],
@@ -3218,7 +3218,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexif.so-notice",
+    licenses: ["vndk-v29-libexif.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libexif.so"],
@@ -3238,7 +3238,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexpat.so-notice",
+    licenses: ["vndk-v29-libexpat.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libexpat.so"],
@@ -3316,7 +3316,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libhardware_legacy.so-notice",
+    licenses: ["vndk-v29-libhardware_legacy.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libhardware_legacy.so"],
@@ -3374,7 +3374,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libjpeg.so-notice",
+    licenses: ["vndk-v29-libjpeg.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libjpeg.so"],
@@ -3394,7 +3394,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v29-libkeymaster_messages.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libkeymaster_messages.so"],
@@ -3414,7 +3414,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v29-libkeymaster_portable.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libkeymaster_portable.so"],
@@ -3434,7 +3434,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_abr.so-notice",
+    licenses: ["vndk-v29-libldacBT_abr.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libldacBT_abr.so"],
@@ -3454,7 +3454,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_enc.so-notice",
+    licenses: ["vndk-v29-libldacBT_enc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libldacBT_enc.so"],
@@ -3474,7 +3474,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-liblz4.so-notice",
+    licenses: ["vndk-v29-liblz4.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/liblz4.so"],
@@ -3494,7 +3494,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_helper.so-notice",
+    licenses: ["vndk-v29-libmedia_helper.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so"],
@@ -3514,7 +3514,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_omx.so-notice",
+    licenses: ["vndk-v29-libmedia_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libmedia_omx.so"],
@@ -3553,7 +3553,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libminijail.so-notice",
+    licenses: ["vndk-v29-libminijail.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libminijail.so"],
@@ -3592,7 +3592,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnetutils.so-notice",
+    licenses: ["vndk-v29-libnetutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libnetutils.so"],
@@ -3612,7 +3612,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnl.so-notice",
+    licenses: ["vndk-v29-libnl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libnl.so"],
@@ -3632,7 +3632,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpcre2.so-notice",
+    licenses: ["vndk-v29-libpcre2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpcre2.so"],
@@ -3652,7 +3652,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpiex.so-notice",
+    licenses: ["vndk-v29-libpiex.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpiex.so"],
@@ -3691,7 +3691,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpower.so-notice",
+    licenses: ["vndk-v29-libpower.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpower.so"],
@@ -3730,7 +3730,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-full.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -3750,7 +3750,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-lite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -3770,7 +3770,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libpuresoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -3828,7 +3828,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libsoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -3848,7 +3848,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libspeexresampler.so-notice",
+    licenses: ["vndk-v29-libspeexresampler.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libspeexresampler.so"],
@@ -3868,7 +3868,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsqlite.so-notice",
+    licenses: ["vndk-v29-libsqlite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libsqlite.so"],
@@ -3888,7 +3888,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libssl.so-notice",
+    licenses: ["vndk-v29-libssl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libssl.so"],
@@ -3946,7 +3946,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v29-libstagefright_foundation.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_foundation.so"],
@@ -3966,7 +3966,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_omx.so"],
@@ -3986,7 +3986,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx_utils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -4044,7 +4044,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyalsa.so-notice",
+    licenses: ["vndk-v29-libtinyalsa.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libtinyalsa.so"],
@@ -4064,7 +4064,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyxml2.so-notice",
+    licenses: ["vndk-v29-libtinyxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libtinyxml2.so"],
@@ -4084,7 +4084,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libui.so-notice",
+    licenses: ["vndk-v29-libui.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libui.so"],
@@ -4142,7 +4142,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libxml2.so-notice",
+    licenses: ["vndk-v29-libxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libxml2.so"],
@@ -4566,7 +4566,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libblas.so-notice",
+    licenses: ["vndk-v29-libblas.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libblas.so"],
@@ -4587,7 +4587,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libc++.so-notice",
+    licenses: ["vndk-v29-libc++.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libc++.so"],
@@ -4609,7 +4609,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libcompiler_rt.so-notice",
+    licenses: ["vndk-v29-libcompiler_rt.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libcompiler_rt.so"],
@@ -4630,7 +4630,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libcutils.so-notice",
+    licenses: ["vndk-v29-libcutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libcutils.so"],
@@ -4651,7 +4651,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhardware.so-notice",
+    licenses: ["vndk-v29-libhardware.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhardware.so"],
@@ -4672,7 +4672,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidlbase.so-notice",
+    licenses: ["vndk-v29-libhidlbase.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so"],
@@ -4713,7 +4713,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidltransport.so-notice",
+    licenses: ["vndk-v29-libhidltransport.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhidltransport.so"],
@@ -4734,7 +4734,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder.so-notice",
+    licenses: ["vndk-v29-libhwbinder.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhwbinder.so"],
@@ -4755,7 +4755,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v29-libhwbinder_noltopgo.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -4876,7 +4876,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutils.so-notice",
+    licenses: ["vndk-v29-libutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libutils.so"],
@@ -4897,7 +4897,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutilscallstack.so-notice",
+    licenses: ["vndk-v29-libutilscallstack.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libutilscallstack.so"],
@@ -4918,7 +4918,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libz.so-notice",
+    licenses: ["vndk-v29-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 6fc3f66..da69747 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -21,242 +21,319 @@
     default_applicable_licenses: ["prebuilts_vndk_v29_license"],
 }
 
-filegroup {
-    name: "vndk-v29-libaudioroute.so-notice",
-    srcs: ["NOTICE_FILES/libaudioroute.so.txt"],
+license {
+    name: "vndk-v29-libaudioroute.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libaudioroute.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libblas.so-notice",
-    srcs: ["NOTICE_FILES/libblas.so.txt"],
+license {
+    name: "vndk-v29-libblas.so-license",
+    license_kinds: ["legacy_notice"],
+    license_text: ["NOTICE_FILES/libblas.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libc++.so-notice",
-    srcs: ["NOTICE_FILES/libc++.so.txt"],
+license {
+    name: "vndk-v29-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-v29-libcap.so-notice",
-    srcs: ["NOTICE_FILES/libcap.so.txt"],
+license {
+    name: "vndk-v29-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-v29-libcompiler_rt.so-notice",
-    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
+license {
+    name: "vndk-v29-libcompiler_rt.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-GPL-2.0",
+    ],
+    license_text: ["NOTICE_FILES/libcompiler_rt.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libcrypto.so-notice",
-    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
+license {
+    name: "vndk-v29-libcrypto.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-ISC",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-OpenSSL",
+    ],
+    license_text: ["NOTICE_FILES/libcrypto.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libcurl.so-notice",
-    srcs: ["NOTICE_FILES/libcurl.so.txt"],
+license {
+    name: "vndk-v29-libcurl.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libcurl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libcutils.so-notice",
-    srcs: ["NOTICE_FILES/libcutils.so.txt"],
+license {
+    name: "vndk-v29-libcutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libcutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libevent.so-notice",
-    srcs: ["NOTICE_FILES/libevent.so.txt"],
+license {
+    name: "vndk-v29-libevent.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libevent.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libexif.so-notice",
-    srcs: ["NOTICE_FILES/libexif.so.txt"],
+license {
+    name: "vndk-v29-libexif.so-license",
+    license_kinds: ["SPDX-license-identifier-LGPL-2.1"],
+    license_text: ["NOTICE_FILES/libexif.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libexpat.so-notice",
-    srcs: ["NOTICE_FILES/libexpat.so.txt"],
+license {
+    name: "vndk-v29-libexpat.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libexpat.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libhardware.so-notice",
-    srcs: ["NOTICE_FILES/libhardware.so.txt"],
+license {
+    name: "vndk-v29-libhardware.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhardware.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libhardware_legacy.so-notice",
-    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
+license {
+    name: "vndk-v29-libhardware_legacy.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhardware_legacy.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libhidlbase.so-notice",
-    srcs: ["NOTICE_FILES/libhidlbase.so.txt"],
+license {
+    name: "vndk-v29-libhidlbase.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhidlbase.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libhidltransport.so-notice",
-    srcs: ["NOTICE_FILES/libhidltransport.so.txt"],
+license {
+    name: "vndk-v29-libhidltransport.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhidltransport.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libhwbinder.so-notice",
-    srcs: ["NOTICE_FILES/libhwbinder.so.txt"],
+license {
+    name: "vndk-v29-libhwbinder.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhwbinder.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libhwbinder_noltopgo.so-notice",
-    srcs: ["NOTICE_FILES/libhwbinder_noltopgo.so.txt"],
+license {
+    name: "vndk-v29-libhwbinder_noltopgo.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhwbinder_noltopgo.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libjpeg.so-notice",
-    srcs: ["NOTICE_FILES/libjpeg.so.txt"],
+license {
+    name: "vndk-v29-libjpeg.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-Zlib",
+    ],
+    license_text: ["NOTICE_FILES/libjpeg.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libkeymaster_messages.so-notice",
-    srcs: ["NOTICE_FILES/libkeymaster_messages.so.txt"],
+license {
+    name: "vndk-v29-libkeymaster_messages.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libkeymaster_messages.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libkeymaster_portable.so-notice",
-    srcs: ["NOTICE_FILES/libkeymaster_portable.so.txt"],
+license {
+    name: "vndk-v29-libkeymaster_portable.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libkeymaster_portable.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libldacBT_abr.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
+license {
+    name: "vndk-v29-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-v29-libldacBT_enc.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
+license {
+    name: "vndk-v29-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-v29-liblz4.so-notice",
-    srcs: ["NOTICE_FILES/liblz4.so.txt"],
+license {
+    name: "vndk-v29-liblz4.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/liblz4.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libmedia_helper.so-notice",
-    srcs: ["NOTICE_FILES/libmedia_helper.so.txt"],
+license {
+    name: "vndk-v29-libmedia_helper.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libmedia_helper.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libmedia_omx.so-notice",
-    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
+license {
+    name: "vndk-v29-libmedia_omx.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libmedia_omx.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libminijail.so-notice",
-    srcs: ["NOTICE_FILES/libminijail.so.txt"],
+license {
+    name: "vndk-v29-libminijail.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libminijail.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libnetutils.so-notice",
-    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
+license {
+    name: "vndk-v29-libnetutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libnetutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libnl.so-notice",
-    srcs: ["NOTICE_FILES/libnl.so.txt"],
+license {
+    name: "vndk-v29-libnl.so-license",
+    license_kinds: ["SPDX-license-identifier-LGPL-2.1"],
+    license_text: ["NOTICE_FILES/libnl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libpcre2.so-notice",
-    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
+license {
+    name: "vndk-v29-libpcre2.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libpcre2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libpiex.so-notice",
-    srcs: ["NOTICE_FILES/libpiex.so.txt"],
+license {
+    name: "vndk-v29-libpiex.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libpiex.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libpower.so-notice",
-    srcs: ["NOTICE_FILES/libpower.so.txt"],
+license {
+    name: "vndk-v29-libpower.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libpower.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libprotobuf-cpp-full.so-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-full.so.txt"],
+license {
+    name: "vndk-v29-libprotobuf-cpp-full.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libprotobuf-cpp-full.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libprotobuf-cpp-lite.so-notice",
-    srcs: ["NOTICE_FILES/libprotobuf-cpp-lite.so.txt"],
+license {
+    name: "vndk-v29-libprotobuf-cpp-lite.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libprotobuf-cpp-lite.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libpuresoftkeymasterdevice.so-notice",
-    srcs: ["NOTICE_FILES/libpuresoftkeymasterdevice.so.txt"],
+license {
+    name: "vndk-v29-libpuresoftkeymasterdevice.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libpuresoftkeymasterdevice.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libsoftkeymasterdevice.so-notice",
-    srcs: ["NOTICE_FILES/libsoftkeymasterdevice.so.txt"],
+license {
+    name: "vndk-v29-libsoftkeymasterdevice.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libsoftkeymasterdevice.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libspeexresampler.so-notice",
-    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
+license {
+    name: "vndk-v29-libspeexresampler.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libspeexresampler.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libsqlite.so-notice",
-    srcs: ["NOTICE_FILES/libsqlite.so.txt"],
+license {
+    name: "vndk-v29-libsqlite.so-license",
+    license_kinds: ["legacy_permissive"],
+    license_text: ["NOTICE_FILES/libsqlite.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libssl.so-notice",
-    srcs: ["NOTICE_FILES/libssl.so.txt"],
+license {
+    name: "vndk-v29-libssl.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-ISC",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-OpenSSL",
+    ],
+    license_text: ["NOTICE_FILES/libssl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libstagefright_foundation.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
+license {
+    name: "vndk-v29-libstagefright_foundation.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libstagefright_omx.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
+license {
+    name: "vndk-v29-libstagefright_omx.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_omx.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libstagefright_omx_utils.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
+license {
+    name: "vndk-v29-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-v29-libtinyalsa.so-notice",
-    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
+license {
+    name: "vndk-v29-libtinyalsa.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libtinyalsa.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libtinyxml2.so-notice",
-    srcs: ["NOTICE_FILES/libtinyxml2.so.txt"],
+license {
+    name: "vndk-v29-libtinyxml2.so-license",
+    license_kinds: ["SPDX-license-identifier-Zlib"],
+    license_text: ["NOTICE_FILES/libtinyxml2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libui.so-notice",
-    srcs: ["NOTICE_FILES/libui.so.txt"],
+license {
+    name: "vndk-v29-libui.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libui.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libutils.so-notice",
-    srcs: ["NOTICE_FILES/libutils.so.txt"],
+license {
+    name: "vndk-v29-libutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libutilscallstack.so-notice",
-    srcs: ["NOTICE_FILES/libutilscallstack.so.txt"],
+license {
+    name: "vndk-v29-libutilscallstack.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libutilscallstack.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libxml2.so-notice",
-    srcs: ["NOTICE_FILES/libxml2.so.txt"],
+license {
+    name: "vndk-v29-libxml2.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libxml2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v29-libz.so-notice",
-    srcs: ["NOTICE_FILES/libz.so.txt"],
+license {
+    name: "vndk-v29-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 922f9f6..72bffa1 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -2420,7 +2420,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libaudioroute.so-notice",
+    licenses: ["vndk-v29-libaudioroute.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libaudioroute.so"],
@@ -2485,7 +2485,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcap.so-notice",
+    licenses: ["vndk-v29-libcap.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcap.so"],
@@ -2582,7 +2582,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcrypto.so-notice",
+    licenses: ["vndk-v29-libcrypto.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcrypto.so"],
@@ -2615,7 +2615,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcurl.so-notice",
+    licenses: ["vndk-v29-libcurl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcurl.so"],
@@ -2664,7 +2664,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libevent.so-notice",
+    licenses: ["vndk-v29-libevent.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libevent.so"],
@@ -2681,7 +2681,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexif.so-notice",
+    licenses: ["vndk-v29-libexif.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libexif.so"],
@@ -2698,7 +2698,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexpat.so-notice",
+    licenses: ["vndk-v29-libexpat.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libexpat.so"],
@@ -2764,7 +2764,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libhardware_legacy.so-notice",
+    licenses: ["vndk-v29-libhardware_legacy.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libhardware_legacy.so"],
@@ -2813,7 +2813,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libjpeg.so-notice",
+    licenses: ["vndk-v29-libjpeg.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libjpeg.so"],
@@ -2830,7 +2830,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v29-libkeymaster_messages.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_messages.so"],
@@ -2847,7 +2847,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v29-libkeymaster_portable.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_portable.so"],
@@ -2864,7 +2864,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_abr.so-notice",
+    licenses: ["vndk-v29-libldacBT_abr.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_abr.so"],
@@ -2881,7 +2881,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_enc.so-notice",
+    licenses: ["vndk-v29-libldacBT_enc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_enc.so"],
@@ -2898,7 +2898,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-liblz4.so-notice",
+    licenses: ["vndk-v29-liblz4.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/liblz4.so"],
@@ -2915,7 +2915,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_helper.so-notice",
+    licenses: ["vndk-v29-libmedia_helper.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_helper.so"],
@@ -2932,7 +2932,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_omx.so-notice",
+    licenses: ["vndk-v29-libmedia_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_omx.so"],
@@ -2965,7 +2965,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libminijail.so-notice",
+    licenses: ["vndk-v29-libminijail.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libminijail.so"],
@@ -2998,7 +2998,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnetutils.so-notice",
+    licenses: ["vndk-v29-libnetutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnetutils.so"],
@@ -3015,7 +3015,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnl.so-notice",
+    licenses: ["vndk-v29-libnl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnl.so"],
@@ -3032,7 +3032,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpcre2.so-notice",
+    licenses: ["vndk-v29-libpcre2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpcre2.so"],
@@ -3049,7 +3049,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpiex.so-notice",
+    licenses: ["vndk-v29-libpiex.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpiex.so"],
@@ -3082,7 +3082,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpower.so-notice",
+    licenses: ["vndk-v29-libpower.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpower.so"],
@@ -3115,7 +3115,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-full.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -3132,7 +3132,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-lite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -3149,7 +3149,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libpuresoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -3198,7 +3198,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libsoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -3215,7 +3215,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libspeexresampler.so-notice",
+    licenses: ["vndk-v29-libspeexresampler.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libspeexresampler.so"],
@@ -3232,7 +3232,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsqlite.so-notice",
+    licenses: ["vndk-v29-libsqlite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsqlite.so"],
@@ -3249,7 +3249,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libssl.so-notice",
+    licenses: ["vndk-v29-libssl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libssl.so"],
@@ -3298,7 +3298,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v29-libstagefright_foundation.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_foundation.so"],
@@ -3315,7 +3315,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx.so"],
@@ -3332,7 +3332,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx_utils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -3381,7 +3381,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyalsa.so-notice",
+    licenses: ["vndk-v29-libtinyalsa.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyalsa.so"],
@@ -3398,7 +3398,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyxml2.so-notice",
+    licenses: ["vndk-v29-libtinyxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyxml2.so"],
@@ -3415,7 +3415,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libui.so-notice",
+    licenses: ["vndk-v29-libui.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libui.so"],
@@ -3464,7 +3464,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libxml2.so-notice",
+    licenses: ["vndk-v29-libxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libxml2.so"],
@@ -3824,7 +3824,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libblas.so-notice",
+    licenses: ["vndk-v29-libblas.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libblas.so"],
@@ -3842,7 +3842,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libc++.so-notice",
+    licenses: ["vndk-v29-libc++.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libc++.so"],
@@ -3861,7 +3861,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libcompiler_rt.so-notice",
+    licenses: ["vndk-v29-libcompiler_rt.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcompiler_rt.so"],
@@ -3879,7 +3879,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libcutils.so-notice",
+    licenses: ["vndk-v29-libcutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcutils.so"],
@@ -3897,7 +3897,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhardware.so-notice",
+    licenses: ["vndk-v29-libhardware.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhardware.so"],
@@ -3915,7 +3915,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidlbase.so-notice",
+    licenses: ["vndk-v29-libhidlbase.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhidlbase.so"],
@@ -3950,7 +3950,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidltransport.so-notice",
+    licenses: ["vndk-v29-libhidltransport.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhidltransport.so"],
@@ -3968,7 +3968,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder.so-notice",
+    licenses: ["vndk-v29-libhwbinder.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder.so"],
@@ -3986,7 +3986,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v29-libhwbinder_noltopgo.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -4089,7 +4089,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutils.so-notice",
+    licenses: ["vndk-v29-libutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutils.so"],
@@ -4107,7 +4107,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutilscallstack.so-notice",
+    licenses: ["vndk-v29-libutilscallstack.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutilscallstack.so"],
@@ -4125,7 +4125,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libz.so-notice",
+    licenses: ["vndk-v29-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 5eac1bf..5a60a83 100644
--- a/x86/binder32/Android.bp
+++ b/x86/binder32/Android.bp
@@ -2565,7 +2565,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libaudioroute.so-notice",
+    licenses: ["vndk-v29-libaudioroute.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libaudioroute.so"],
@@ -2634,7 +2634,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcap.so-notice",
+    licenses: ["vndk-v29-libcap.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcap.so"],
@@ -2737,7 +2737,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcrypto.so-notice",
+    licenses: ["vndk-v29-libcrypto.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcrypto.so"],
@@ -2772,7 +2772,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcurl.so-notice",
+    licenses: ["vndk-v29-libcurl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcurl.so"],
@@ -2824,7 +2824,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libevent.so-notice",
+    licenses: ["vndk-v29-libevent.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libevent.so"],
@@ -2842,7 +2842,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexif.so-notice",
+    licenses: ["vndk-v29-libexif.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libexif.so"],
@@ -2860,7 +2860,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexpat.so-notice",
+    licenses: ["vndk-v29-libexpat.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libexpat.so"],
@@ -2930,7 +2930,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libhardware_legacy.so-notice",
+    licenses: ["vndk-v29-libhardware_legacy.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libhardware_legacy.so"],
@@ -2982,7 +2982,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libjpeg.so-notice",
+    licenses: ["vndk-v29-libjpeg.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libjpeg.so"],
@@ -3000,7 +3000,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v29-libkeymaster_messages.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_messages.so"],
@@ -3018,7 +3018,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v29-libkeymaster_portable.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_portable.so"],
@@ -3036,7 +3036,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_abr.so-notice",
+    licenses: ["vndk-v29-libldacBT_abr.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_abr.so"],
@@ -3054,7 +3054,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_enc.so-notice",
+    licenses: ["vndk-v29-libldacBT_enc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_enc.so"],
@@ -3072,7 +3072,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-liblz4.so-notice",
+    licenses: ["vndk-v29-liblz4.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/liblz4.so"],
@@ -3090,7 +3090,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_helper.so-notice",
+    licenses: ["vndk-v29-libmedia_helper.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_helper.so"],
@@ -3108,7 +3108,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_omx.so-notice",
+    licenses: ["vndk-v29-libmedia_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_omx.so"],
@@ -3143,7 +3143,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libminijail.so-notice",
+    licenses: ["vndk-v29-libminijail.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libminijail.so"],
@@ -3178,7 +3178,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnetutils.so-notice",
+    licenses: ["vndk-v29-libnetutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnetutils.so"],
@@ -3196,7 +3196,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnl.so-notice",
+    licenses: ["vndk-v29-libnl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnl.so"],
@@ -3214,7 +3214,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpcre2.so-notice",
+    licenses: ["vndk-v29-libpcre2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpcre2.so"],
@@ -3232,7 +3232,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpiex.so-notice",
+    licenses: ["vndk-v29-libpiex.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpiex.so"],
@@ -3267,7 +3267,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpower.so-notice",
+    licenses: ["vndk-v29-libpower.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpower.so"],
@@ -3302,7 +3302,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-full.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -3320,7 +3320,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-lite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -3338,7 +3338,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libpuresoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -3390,7 +3390,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libsoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -3408,7 +3408,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libspeexresampler.so-notice",
+    licenses: ["vndk-v29-libspeexresampler.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libspeexresampler.so"],
@@ -3426,7 +3426,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsqlite.so-notice",
+    licenses: ["vndk-v29-libsqlite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsqlite.so"],
@@ -3444,7 +3444,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libssl.so-notice",
+    licenses: ["vndk-v29-libssl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libssl.so"],
@@ -3496,7 +3496,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v29-libstagefright_foundation.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_foundation.so"],
@@ -3514,7 +3514,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx.so"],
@@ -3532,7 +3532,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx_utils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -3584,7 +3584,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyalsa.so-notice",
+    licenses: ["vndk-v29-libtinyalsa.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyalsa.so"],
@@ -3602,7 +3602,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyxml2.so-notice",
+    licenses: ["vndk-v29-libtinyxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyxml2.so"],
@@ -3620,7 +3620,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libui.so-notice",
+    licenses: ["vndk-v29-libui.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libui.so"],
@@ -3672,7 +3672,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libxml2.so-notice",
+    licenses: ["vndk-v29-libxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libxml2.so"],
@@ -4053,7 +4053,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libblas.so-notice",
+    licenses: ["vndk-v29-libblas.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libblas.so"],
@@ -4072,7 +4072,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libc++.so-notice",
+    licenses: ["vndk-v29-libc++.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libc++.so"],
@@ -4092,7 +4092,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libcompiler_rt.so-notice",
+    licenses: ["vndk-v29-libcompiler_rt.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcompiler_rt.so"],
@@ -4111,7 +4111,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libcutils.so-notice",
+    licenses: ["vndk-v29-libcutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcutils.so"],
@@ -4130,7 +4130,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhardware.so-notice",
+    licenses: ["vndk-v29-libhardware.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhardware.so"],
@@ -4149,7 +4149,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidlbase.so-notice",
+    licenses: ["vndk-v29-libhidlbase.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhidlbase.so"],
@@ -4186,7 +4186,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidltransport.so-notice",
+    licenses: ["vndk-v29-libhidltransport.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhidltransport.so"],
@@ -4205,7 +4205,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder.so-notice",
+    licenses: ["vndk-v29-libhwbinder.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder.so"],
@@ -4224,7 +4224,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v29-libhwbinder_noltopgo.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -4333,7 +4333,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutils.so-notice",
+    licenses: ["vndk-v29-libutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutils.so"],
@@ -4352,7 +4352,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutilscallstack.so-notice",
+    licenses: ["vndk-v29-libutilscallstack.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutilscallstack.so"],
@@ -4371,7 +4371,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libz.so-notice",
+    licenses: ["vndk-v29-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 aac96e3..c7a03a6 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -2870,7 +2870,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libaudioroute.so-notice",
+    licenses: ["vndk-v29-libaudioroute.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libaudioroute.so"],
@@ -2947,7 +2947,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcap.so-notice",
+    licenses: ["vndk-v29-libcap.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcap.so"],
@@ -3101,7 +3101,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcrypto.so-notice",
+    licenses: ["vndk-v29-libcrypto.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcrypto.so"],
@@ -3140,7 +3140,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcurl.so-notice",
+    licenses: ["vndk-v29-libcurl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcurl.so"],
@@ -3198,7 +3198,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libevent.so-notice",
+    licenses: ["vndk-v29-libevent.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libevent.so"],
@@ -3218,7 +3218,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexif.so-notice",
+    licenses: ["vndk-v29-libexif.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libexif.so"],
@@ -3238,7 +3238,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexpat.so-notice",
+    licenses: ["vndk-v29-libexpat.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libexpat.so"],
@@ -3316,7 +3316,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libhardware_legacy.so-notice",
+    licenses: ["vndk-v29-libhardware_legacy.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libhardware_legacy.so"],
@@ -3374,7 +3374,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libjpeg.so-notice",
+    licenses: ["vndk-v29-libjpeg.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libjpeg.so"],
@@ -3394,7 +3394,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v29-libkeymaster_messages.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libkeymaster_messages.so"],
@@ -3414,7 +3414,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v29-libkeymaster_portable.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libkeymaster_portable.so"],
@@ -3434,7 +3434,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_abr.so-notice",
+    licenses: ["vndk-v29-libldacBT_abr.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libldacBT_abr.so"],
@@ -3454,7 +3454,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_enc.so-notice",
+    licenses: ["vndk-v29-libldacBT_enc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libldacBT_enc.so"],
@@ -3474,7 +3474,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-liblz4.so-notice",
+    licenses: ["vndk-v29-liblz4.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/liblz4.so"],
@@ -3494,7 +3494,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_helper.so-notice",
+    licenses: ["vndk-v29-libmedia_helper.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libmedia_helper.so"],
@@ -3514,7 +3514,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_omx.so-notice",
+    licenses: ["vndk-v29-libmedia_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libmedia_omx.so"],
@@ -3553,7 +3553,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libminijail.so-notice",
+    licenses: ["vndk-v29-libminijail.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libminijail.so"],
@@ -3592,7 +3592,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnetutils.so-notice",
+    licenses: ["vndk-v29-libnetutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libnetutils.so"],
@@ -3612,7 +3612,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnl.so-notice",
+    licenses: ["vndk-v29-libnl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libnl.so"],
@@ -3632,7 +3632,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpcre2.so-notice",
+    licenses: ["vndk-v29-libpcre2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpcre2.so"],
@@ -3652,7 +3652,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpiex.so-notice",
+    licenses: ["vndk-v29-libpiex.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpiex.so"],
@@ -3691,7 +3691,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpower.so-notice",
+    licenses: ["vndk-v29-libpower.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpower.so"],
@@ -3730,7 +3730,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-full.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -3750,7 +3750,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-lite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -3770,7 +3770,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libpuresoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -3828,7 +3828,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libsoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -3848,7 +3848,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libspeexresampler.so-notice",
+    licenses: ["vndk-v29-libspeexresampler.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libspeexresampler.so"],
@@ -3868,7 +3868,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsqlite.so-notice",
+    licenses: ["vndk-v29-libsqlite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libsqlite.so"],
@@ -3888,7 +3888,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libssl.so-notice",
+    licenses: ["vndk-v29-libssl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libssl.so"],
@@ -3946,7 +3946,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v29-libstagefright_foundation.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_foundation.so"],
@@ -3966,7 +3966,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_omx.so"],
@@ -3986,7 +3986,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx_utils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -4044,7 +4044,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyalsa.so-notice",
+    licenses: ["vndk-v29-libtinyalsa.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libtinyalsa.so"],
@@ -4064,7 +4064,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyxml2.so-notice",
+    licenses: ["vndk-v29-libtinyxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libtinyxml2.so"],
@@ -4084,7 +4084,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libui.so-notice",
+    licenses: ["vndk-v29-libui.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libui.so"],
@@ -4142,7 +4142,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libxml2.so-notice",
+    licenses: ["vndk-v29-libxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-core/libxml2.so"],
@@ -4566,7 +4566,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libblas.so-notice",
+    licenses: ["vndk-v29-libblas.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libblas.so"],
@@ -4587,7 +4587,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libc++.so-notice",
+    licenses: ["vndk-v29-libc++.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libc++.so"],
@@ -4609,7 +4609,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libcompiler_rt.so-notice",
+    licenses: ["vndk-v29-libcompiler_rt.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libcompiler_rt.so"],
@@ -4630,7 +4630,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libcutils.so-notice",
+    licenses: ["vndk-v29-libcutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libcutils.so"],
@@ -4651,7 +4651,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhardware.so-notice",
+    licenses: ["vndk-v29-libhardware.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libhardware.so"],
@@ -4672,7 +4672,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidlbase.so-notice",
+    licenses: ["vndk-v29-libhidlbase.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libhidlbase.so"],
@@ -4713,7 +4713,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidltransport.so-notice",
+    licenses: ["vndk-v29-libhidltransport.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libhidltransport.so"],
@@ -4734,7 +4734,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder.so-notice",
+    licenses: ["vndk-v29-libhwbinder.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libhwbinder.so"],
@@ -4755,7 +4755,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v29-libhwbinder_noltopgo.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -4876,7 +4876,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutils.so-notice",
+    licenses: ["vndk-v29-libutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libutils.so"],
@@ -4897,7 +4897,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutilscallstack.so-notice",
+    licenses: ["vndk-v29-libutilscallstack.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libutilscallstack.so"],
@@ -4918,7 +4918,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libz.so-notice",
+    licenses: ["vndk-v29-libz.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libz.so"],