diff --git a/arm/Android.bp b/arm/Android.bp
index 37f5818..6f529ff 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -1173,7 +1173,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcap.so-notice",
+    licenses: ["vndk-v32-libcap.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1240,7 +1240,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcn-cbor.so-notice",
+    licenses: ["vndk-v32-libcn-cbor.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1291,7 +1291,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcrypto.so-notice",
+    licenses: ["vndk-v32-libcrypto.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1329,7 +1329,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcurl.so-notice",
+    licenses: ["vndk-v32-libcurl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1387,7 +1387,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libevent.so-notice",
+    licenses: ["vndk-v32-libevent.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1406,7 +1406,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libexif.so-notice",
+    licenses: ["vndk-v32-libexif.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1426,7 +1426,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libexpat.so-notice",
+    licenses: ["vndk-v32-libexpat.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1559,7 +1559,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libhardware_legacy.so-notice",
+    licenses: ["vndk-v32-libhardware_legacy.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1618,7 +1618,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libjpeg.so-notice",
+    licenses: ["vndk-v32-libjpeg.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1638,7 +1638,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libldacBT_abr.so-notice",
+    licenses: ["vndk-v32-libldacBT_abr.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1658,7 +1658,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libldacBT_enc.so-notice",
+    licenses: ["vndk-v32-libldacBT_enc.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1678,7 +1678,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-liblz4.so-notice",
+    licenses: ["vndk-v32-liblz4.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1715,7 +1715,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libmedia_omx.so-notice",
+    licenses: ["vndk-v32-libmedia_omx.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1802,7 +1802,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libminijail.so-notice",
+    licenses: ["vndk-v32-libminijail.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1839,7 +1839,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libnetutils.so-notice",
+    licenses: ["vndk-v32-libnetutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1859,7 +1859,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libnl.so-notice",
+    licenses: ["vndk-v32-libnl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1879,7 +1879,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpcre2.so-notice",
+    licenses: ["vndk-v32-libpcre2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1899,7 +1899,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpiex.so-notice",
+    licenses: ["vndk-v32-libpiex.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1919,7 +1919,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpng.so-notice",
+    licenses: ["vndk-v32-libpng.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1938,7 +1938,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpower.so-notice",
+    licenses: ["vndk-v32-libpower.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1996,7 +1996,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libspeexresampler.so-notice",
+    licenses: ["vndk-v32-libspeexresampler.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2015,7 +2015,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libsqlite.so-notice",
+    licenses: ["vndk-v32-libsqlite.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2035,7 +2035,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libssl.so-notice",
+    licenses: ["vndk-v32-libssl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2139,7 +2139,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v32-libstagefright_foundation.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2167,7 +2167,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libstagefright_omx.so-notice",
+    licenses: ["vndk-v32-libstagefright_omx.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2197,7 +2197,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v32-libstagefright_omx_utils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2303,7 +2303,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libtinyalsa.so-notice",
+    licenses: ["vndk-v32-libtinyalsa.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2323,7 +2323,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libtinyxml2.so-notice",
+    licenses: ["vndk-v32-libtinyxml2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2342,7 +2342,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libui.so-notice",
+    licenses: ["vndk-v32-libui.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2436,7 +2436,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libxml2.so-notice",
+    licenses: ["vndk-v32-libxml2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2456,7 +2456,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libyuv.so-notice",
+    licenses: ["vndk-v32-libyuv.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3073,7 +3073,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libbase.so-notice",
+    licenses: ["vndk-v32-libbase.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3114,7 +3114,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v32-libblas.so-notice",
+    licenses: ["vndk-v32-libblas.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3135,7 +3135,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libc++.so-notice",
+    licenses: ["vndk-v32-libc++.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3158,7 +3158,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v32-libcompiler_rt.so-notice",
+    licenses: ["vndk-v32-libcompiler_rt.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"],
@@ -3176,7 +3176,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libcutils.so-notice",
+    licenses: ["vndk-v32-libcutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3266,7 +3266,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libhardware.so-notice",
+    licenses: ["vndk-v32-libhardware.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3291,7 +3291,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libhidlbase.so-notice",
+    licenses: ["vndk-v32-libhidlbase.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3388,7 +3388,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libjsoncpp.so-notice",
+    licenses: ["vndk-v32-libjsoncpp.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3469,7 +3469,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libutils.so-notice",
+    licenses: ["vndk-v32-libutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3495,7 +3495,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libutilscallstack.so-notice",
+    licenses: ["vndk-v32-libutilscallstack.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3521,7 +3521,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libz.so-notice",
+    licenses: ["vndk-v32-libz.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3631,7 +3631,7 @@
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libbinder_ndk.so-notice",
+    licenses: ["vndk-v32-libbinder_ndk.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3650,7 +3650,7 @@
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libc.so-notice",
+    licenses: ["vndk-v32-libc.so-license"],
     arch: {
         arm: {
             export_system_include_dirs: [
@@ -3700,7 +3700,7 @@
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libdl.so-notice",
+    licenses: ["vndk-v32-libdl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/llndk-stub/libdl.so"],
@@ -3714,7 +3714,7 @@
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libft2.so-notice",
+    licenses: ["vndk-v32-libft2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3731,7 +3731,7 @@
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-liblog.so-notice",
+    licenses: ["vndk-v32-liblog.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3748,7 +3748,7 @@
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libm.so-notice",
+    licenses: ["vndk-v32-libm.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/llndk-stub/libm.so"],
@@ -3762,7 +3762,7 @@
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libmediandk.so-notice",
+    licenses: ["vndk-v32-libmediandk.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3780,7 +3780,7 @@
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libnativewindow.so-notice",
+    licenses: ["vndk-v32-libnativewindow.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3797,7 +3797,7 @@
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libneuralnetworks.so-notice",
+    licenses: ["vndk-v32-libneuralnetworks.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3814,7 +3814,7 @@
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libselinux.so-notice",
+    licenses: ["vndk-v32-libselinux.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3831,7 +3831,7 @@
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libsync.so-notice",
+    licenses: ["vndk-v32-libsync.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 270dcd0..78b864a 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -1811,7 +1811,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcap.so-notice",
+    licenses: ["vndk-v32-libcap.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1932,7 +1932,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcn-cbor.so-notice",
+    licenses: ["vndk-v32-libcn-cbor.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2008,7 +2008,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcrypto.so-notice",
+    licenses: ["vndk-v32-libcrypto.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2058,7 +2058,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcurl.so-notice",
+    licenses: ["vndk-v32-libcurl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2136,7 +2136,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libevent.so-notice",
+    licenses: ["vndk-v32-libevent.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2161,7 +2161,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libexif.so-notice",
+    licenses: ["vndk-v32-libexif.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2187,7 +2187,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libexpat.so-notice",
+    licenses: ["vndk-v32-libexpat.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2402,7 +2402,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libhardware_legacy.so-notice",
+    licenses: ["vndk-v32-libhardware_legacy.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2494,7 +2494,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libjpeg.so-notice",
+    licenses: ["vndk-v32-libjpeg.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2520,7 +2520,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libldacBT_abr.so-notice",
+    licenses: ["vndk-v32-libldacBT_abr.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2546,7 +2546,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libldacBT_enc.so-notice",
+    licenses: ["vndk-v32-libldacBT_enc.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2572,7 +2572,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-liblz4.so-notice",
+    licenses: ["vndk-v32-liblz4.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2621,7 +2621,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libmedia_omx.so-notice",
+    licenses: ["vndk-v32-libmedia_omx.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2769,7 +2769,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libminijail.so-notice",
+    licenses: ["vndk-v32-libminijail.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2818,7 +2818,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libnetutils.so-notice",
+    licenses: ["vndk-v32-libnetutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2844,7 +2844,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libnl.so-notice",
+    licenses: ["vndk-v32-libnl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2870,7 +2870,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpcre2.so-notice",
+    licenses: ["vndk-v32-libpcre2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2896,7 +2896,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpiex.so-notice",
+    licenses: ["vndk-v32-libpiex.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2922,7 +2922,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpng.so-notice",
+    licenses: ["vndk-v32-libpng.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2947,7 +2947,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpower.so-notice",
+    licenses: ["vndk-v32-libpower.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3024,7 +3024,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libspeexresampler.so-notice",
+    licenses: ["vndk-v32-libspeexresampler.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3049,7 +3049,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libsqlite.so-notice",
+    licenses: ["vndk-v32-libsqlite.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3075,7 +3075,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libssl.so-notice",
+    licenses: ["vndk-v32-libssl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3246,7 +3246,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v32-libstagefright_foundation.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3289,7 +3289,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libstagefright_omx.so-notice",
+    licenses: ["vndk-v32-libstagefright_omx.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3336,7 +3336,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v32-libstagefright_omx_utils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3510,7 +3510,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libtinyalsa.so-notice",
+    licenses: ["vndk-v32-libtinyalsa.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3536,7 +3536,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libtinyxml2.so-notice",
+    licenses: ["vndk-v32-libtinyxml2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3561,7 +3561,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libui.so-notice",
+    licenses: ["vndk-v32-libui.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3710,7 +3710,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libxml2.so-notice",
+    licenses: ["vndk-v32-libxml2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3736,7 +3736,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libyuv.so-notice",
+    licenses: ["vndk-v32-libyuv.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4682,7 +4682,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libbase.so-notice",
+    licenses: ["vndk-v32-libbase.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4736,7 +4736,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v32-libblas.so-notice",
+    licenses: ["vndk-v32-libblas.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4763,7 +4763,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libc++.so-notice",
+    licenses: ["vndk-v32-libc++.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4793,7 +4793,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v32-libcompiler_rt.so-notice",
+    licenses: ["vndk-v32-libcompiler_rt.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libcompiler_rt.so"],
@@ -4814,7 +4814,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libcutils.so-notice",
+    licenses: ["vndk-v32-libcutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4954,7 +4954,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libhardware.so-notice",
+    licenses: ["vndk-v32-libhardware.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4989,7 +4989,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libhidlbase.so-notice",
+    licenses: ["vndk-v32-libhidlbase.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5140,7 +5140,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libjsoncpp.so-notice",
+    licenses: ["vndk-v32-libjsoncpp.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5245,7 +5245,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libutils.so-notice",
+    licenses: ["vndk-v32-libutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5282,7 +5282,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libutilscallstack.so-notice",
+    licenses: ["vndk-v32-libutilscallstack.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5319,7 +5319,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libz.so-notice",
+    licenses: ["vndk-v32-libz.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5468,7 +5468,7 @@
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libbinder_ndk.so-notice",
+    licenses: ["vndk-v32-libbinder_ndk.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5495,7 +5495,7 @@
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libc.so-notice",
+    licenses: ["vndk-v32-libc.so-license"],
     arch: {
         arm: {
             export_system_include_dirs: [
@@ -5587,7 +5587,7 @@
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libdl.so-notice",
+    licenses: ["vndk-v32-libdl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/llndk-stub/libdl.so"],
@@ -5604,7 +5604,7 @@
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libft2.so-notice",
+    licenses: ["vndk-v32-libft2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5627,7 +5627,7 @@
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-liblog.so-notice",
+    licenses: ["vndk-v32-liblog.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5650,7 +5650,7 @@
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libm.so-notice",
+    licenses: ["vndk-v32-libm.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/llndk-stub/libm.so"],
@@ -5667,7 +5667,7 @@
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libmediandk.so-notice",
+    licenses: ["vndk-v32-libmediandk.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5692,7 +5692,7 @@
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libnativewindow.so-notice",
+    licenses: ["vndk-v32-libnativewindow.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5715,7 +5715,7 @@
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libneuralnetworks.so-notice",
+    licenses: ["vndk-v32-libneuralnetworks.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5738,7 +5738,7 @@
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libselinux.so-notice",
+    licenses: ["vndk-v32-libselinux.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5761,7 +5761,7 @@
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libsync.so-notice",
+    licenses: ["vndk-v32-libsync.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
diff --git a/common/Android.bp b/common/Android.bp
index a338f7a..23d07fd 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -5,267 +5,370 @@
     default_applicable_licenses: ["prebuilts_vndk_v32_license"],
 }
 
-filegroup {
-    name: "vndk-v32-libbase.so-notice",
-    srcs: ["NOTICE_FILES/libbase.so.txt"],
+license {
+    name: "vndk-v32-libbase.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+    ],
+    license_text: ["NOTICE_FILES/libbase.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libbinder_ndk.so-notice",
-    srcs: ["NOTICE_FILES/libbinder_ndk.so.txt"],
+license {
+    name: "vndk-v32-libbinder_ndk.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libbinder_ndk.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libblas.so-notice",
-    srcs: ["NOTICE_FILES/libblas.so.txt"],
+license {
+    name: "vndk-v32-libblas.so-license",
+    license_kinds: ["legacy_notice"],
+    license_text: ["NOTICE_FILES/libblas.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libc++.so-notice",
-    srcs: ["NOTICE_FILES/libc++.so.txt"],
+license {
+    name: "vndk-v32-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-v32-libc.so-notice",
-    srcs: ["NOTICE_FILES/libc.so.txt"],
+license {
+    name: "vndk-v32-libc.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-ISC",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: ["NOTICE_FILES/libc.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libcap.so-notice",
-    srcs: ["NOTICE_FILES/libcap.so.txt"],
+license {
+    name: "vndk-v32-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-v32-libcn-cbor.so-notice",
-    srcs: ["NOTICE_FILES/libcn-cbor.so.txt"],
+license {
+    name: "vndk-v32-libcn-cbor.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libcn-cbor.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libcompiler_rt.so-notice",
-    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
+license {
+    name: "vndk-v32-libcompiler_rt.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-NCSA",
+    ],
+    license_text: ["NOTICE_FILES/libcompiler_rt.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libcrypto.so-notice",
-    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
+license {
+    name: "vndk-v32-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-v32-libcurl.so-notice",
-    srcs: ["NOTICE_FILES/libcurl.so.txt"],
+license {
+    name: "vndk-v32-libcurl.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libcurl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libcutils.so-notice",
-    srcs: ["NOTICE_FILES/libcutils.so.txt"],
+license {
+    name: "vndk-v32-libcutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libcutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libdl.so-notice",
-    srcs: ["NOTICE_FILES/libdl.so.txt"],
+license {
+    name: "vndk-v32-libdl.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libdl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libevent.so-notice",
-    srcs: ["NOTICE_FILES/libevent.so.txt"],
+license {
+    name: "vndk-v32-libevent.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: ["NOTICE_FILES/libevent.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libexif.so-notice",
-    srcs: ["NOTICE_FILES/libexif.so.txt"],
+license {
+    name: "vndk-v32-libexif.so-license",
+    license_kinds: ["SPDX-license-identifier-LGPL-2.1"],
+    license_text: ["NOTICE_FILES/libexif.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libexpat.so-notice",
-    srcs: ["NOTICE_FILES/libexpat.so.txt"],
+license {
+    name: "vndk-v32-libexpat.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libexpat.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libft2.so-notice",
-    srcs: ["NOTICE_FILES/libft2.so.txt"],
+license {
+    name: "vndk-v32-libft2.so-license",
+    license_kinds: ["SPDX-license-identifier-FTL"],
+    license_text: ["NOTICE_FILES/libft2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libhardware.so-notice",
-    srcs: ["NOTICE_FILES/libhardware.so.txt"],
+license {
+    name: "vndk-v32-libhardware.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhardware.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libhardware_legacy.so-notice",
-    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
+license {
+    name: "vndk-v32-libhardware_legacy.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhardware_legacy.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libhidlbase.so-notice",
-    srcs: ["NOTICE_FILES/libhidlbase.so.txt"],
+license {
+    name: "vndk-v32-libhidlbase.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhidlbase.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libjpeg.so-notice",
-    srcs: ["NOTICE_FILES/libjpeg.so.txt"],
+license {
+    name: "vndk-v32-libjpeg.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-Zlib",
+    ],
+    license_text: ["NOTICE_FILES/libjpeg.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libjsoncpp.so-notice",
-    srcs: ["NOTICE_FILES/libjsoncpp.so.txt"],
+license {
+    name: "vndk-v32-libjsoncpp.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-MIT",
+        "legacy_unencumbered",
+    ],
+    license_text: ["NOTICE_FILES/libjsoncpp.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libldacBT_abr.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
+license {
+    name: "vndk-v32-libldacBT_abr.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libldacBT_abr.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libldacBT_enc.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
+license {
+    name: "vndk-v32-libldacBT_enc.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libldacBT_enc.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-liblog.so-notice",
-    srcs: ["NOTICE_FILES/liblog.so.txt"],
+license {
+    name: "vndk-v32-liblog.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/liblog.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-liblz4.so-notice",
-    srcs: ["NOTICE_FILES/liblz4.so.txt"],
+license {
+    name: "vndk-v32-liblz4.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/liblz4.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libm.so-notice",
-    srcs: ["NOTICE_FILES/libm.so.txt"],
+license {
+    name: "vndk-v32-libm.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: ["NOTICE_FILES/libm.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libmedia_omx.so-notice",
-    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
+license {
+    name: "vndk-v32-libmedia_omx.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libmedia_omx.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libmediandk.so-notice",
-    srcs: ["NOTICE_FILES/libmediandk.so.txt"],
+license {
+    name: "vndk-v32-libmediandk.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-Unicode-DFS",
+    ],
+    license_text: ["NOTICE_FILES/libmediandk.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libminijail.so-notice",
-    srcs: ["NOTICE_FILES/libminijail.so.txt"],
+license {
+    name: "vndk-v32-libminijail.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libminijail.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libnativewindow.so-notice",
-    srcs: ["NOTICE_FILES/libnativewindow.so.txt"],
+license {
+    name: "vndk-v32-libnativewindow.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libnativewindow.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libnetutils.so-notice",
-    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
+license {
+    name: "vndk-v32-libnetutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libnetutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libneuralnetworks.so-notice",
-    srcs: ["NOTICE_FILES/libneuralnetworks.so.txt"],
+license {
+    name: "vndk-v32-libneuralnetworks.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MPL-2.0",
+    ],
+    license_text: ["NOTICE_FILES/libneuralnetworks.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libnl.so-notice",
-    srcs: ["NOTICE_FILES/libnl.so.txt"],
+license {
+    name: "vndk-v32-libnl.so-license",
+    license_kinds: ["SPDX-license-identifier-LGPL-2.1"],
+    license_text: ["NOTICE_FILES/libnl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libpcre2.so-notice",
-    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
+license {
+    name: "vndk-v32-libpcre2.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libpcre2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libpiex.so-notice",
-    srcs: ["NOTICE_FILES/libpiex.so.txt"],
+license {
+    name: "vndk-v32-libpiex.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libpiex.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libpng.so-notice",
-    srcs: ["NOTICE_FILES/libpng.so.txt"],
+license {
+    name: "vndk-v32-libpng.so-license",
+    license_kinds: ["legacy_notice"],
+    license_text: ["NOTICE_FILES/libpng.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libpower.so-notice",
-    srcs: ["NOTICE_FILES/libpower.so.txt"],
+license {
+    name: "vndk-v32-libpower.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libpower.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libselinux.so-notice",
-    srcs: ["NOTICE_FILES/libselinux.so.txt"],
+license {
+    name: "vndk-v32-libselinux.so-license",
+    license_kinds: ["legacy_unencumbered"],
+    license_text: ["NOTICE_FILES/libselinux.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libspeexresampler.so-notice",
-    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
+license {
+    name: "vndk-v32-libspeexresampler.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libspeexresampler.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libsqlite.so-notice",
-    srcs: ["NOTICE_FILES/libsqlite.so.txt"],
+license {
+    name: "vndk-v32-libsqlite.so-license",
+    license_kinds: ["legacy_permissive"],
+    license_text: ["NOTICE_FILES/libsqlite.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libssl.so-notice",
-    srcs: ["NOTICE_FILES/libssl.so.txt"],
+license {
+    name: "vndk-v32-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-v32-libstagefright_foundation.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
+license {
+    name: "vndk-v32-libstagefright_foundation.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libstagefright_omx.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
+license {
+    name: "vndk-v32-libstagefright_omx.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_omx.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libstagefright_omx_utils.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
+license {
+    name: "vndk-v32-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-v32-libsync.so-notice",
-    srcs: ["NOTICE_FILES/libsync.so.txt"],
+license {
+    name: "vndk-v32-libsync.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libsync.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libtinyalsa.so-notice",
-    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
+license {
+    name: "vndk-v32-libtinyalsa.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libtinyalsa.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libtinyxml2.so-notice",
-    srcs: ["NOTICE_FILES/libtinyxml2.so.txt"],
+license {
+    name: "vndk-v32-libtinyxml2.so-license",
+    license_kinds: ["SPDX-license-identifier-Zlib"],
+    license_text: ["NOTICE_FILES/libtinyxml2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libui.so-notice",
-    srcs: ["NOTICE_FILES/libui.so.txt"],
+license {
+    name: "vndk-v32-libui.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libui.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libutils.so-notice",
-    srcs: ["NOTICE_FILES/libutils.so.txt"],
+license {
+    name: "vndk-v32-libutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libutilscallstack.so-notice",
-    srcs: ["NOTICE_FILES/libutilscallstack.so.txt"],
+license {
+    name: "vndk-v32-libutilscallstack.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libutilscallstack.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libxml2.so-notice",
-    srcs: ["NOTICE_FILES/libxml2.so.txt"],
+license {
+    name: "vndk-v32-libxml2.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libxml2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libyuv.so-notice",
-    srcs: ["NOTICE_FILES/libyuv.so.txt"],
+license {
+    name: "vndk-v32-libyuv.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libyuv.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v32-libz.so-notice",
-    srcs: ["NOTICE_FILES/libz.so.txt"],
+license {
+    name: "vndk-v32-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 b54ee48..1c587b0 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -1173,7 +1173,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcap.so-notice",
+    licenses: ["vndk-v32-libcap.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1240,7 +1240,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcn-cbor.so-notice",
+    licenses: ["vndk-v32-libcn-cbor.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1291,7 +1291,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcrypto.so-notice",
+    licenses: ["vndk-v32-libcrypto.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1329,7 +1329,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcurl.so-notice",
+    licenses: ["vndk-v32-libcurl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1387,7 +1387,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libevent.so-notice",
+    licenses: ["vndk-v32-libevent.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1406,7 +1406,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libexif.so-notice",
+    licenses: ["vndk-v32-libexif.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1426,7 +1426,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libexpat.so-notice",
+    licenses: ["vndk-v32-libexpat.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1559,7 +1559,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libhardware_legacy.so-notice",
+    licenses: ["vndk-v32-libhardware_legacy.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1618,7 +1618,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libjpeg.so-notice",
+    licenses: ["vndk-v32-libjpeg.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1638,7 +1638,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libldacBT_abr.so-notice",
+    licenses: ["vndk-v32-libldacBT_abr.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1658,7 +1658,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libldacBT_enc.so-notice",
+    licenses: ["vndk-v32-libldacBT_enc.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1678,7 +1678,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-liblz4.so-notice",
+    licenses: ["vndk-v32-liblz4.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1715,7 +1715,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libmedia_omx.so-notice",
+    licenses: ["vndk-v32-libmedia_omx.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1802,7 +1802,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libminijail.so-notice",
+    licenses: ["vndk-v32-libminijail.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1839,7 +1839,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libnetutils.so-notice",
+    licenses: ["vndk-v32-libnetutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1859,7 +1859,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libnl.so-notice",
+    licenses: ["vndk-v32-libnl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1879,7 +1879,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpcre2.so-notice",
+    licenses: ["vndk-v32-libpcre2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1899,7 +1899,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpiex.so-notice",
+    licenses: ["vndk-v32-libpiex.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1919,7 +1919,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpng.so-notice",
+    licenses: ["vndk-v32-libpng.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1938,7 +1938,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpower.so-notice",
+    licenses: ["vndk-v32-libpower.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1996,7 +1996,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libspeexresampler.so-notice",
+    licenses: ["vndk-v32-libspeexresampler.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2015,7 +2015,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libsqlite.so-notice",
+    licenses: ["vndk-v32-libsqlite.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2035,7 +2035,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libssl.so-notice",
+    licenses: ["vndk-v32-libssl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2139,7 +2139,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v32-libstagefright_foundation.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2167,7 +2167,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libstagefright_omx.so-notice",
+    licenses: ["vndk-v32-libstagefright_omx.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2197,7 +2197,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v32-libstagefright_omx_utils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2303,7 +2303,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libtinyalsa.so-notice",
+    licenses: ["vndk-v32-libtinyalsa.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2323,7 +2323,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libtinyxml2.so-notice",
+    licenses: ["vndk-v32-libtinyxml2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2342,7 +2342,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libui.so-notice",
+    licenses: ["vndk-v32-libui.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2436,7 +2436,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libxml2.so-notice",
+    licenses: ["vndk-v32-libxml2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2456,7 +2456,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libyuv.so-notice",
+    licenses: ["vndk-v32-libyuv.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3073,7 +3073,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libbase.so-notice",
+    licenses: ["vndk-v32-libbase.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3114,7 +3114,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v32-libblas.so-notice",
+    licenses: ["vndk-v32-libblas.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3135,7 +3135,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libc++.so-notice",
+    licenses: ["vndk-v32-libc++.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3158,7 +3158,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v32-libcompiler_rt.so-notice",
+    licenses: ["vndk-v32-libcompiler_rt.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86/shared/vndk-sp/libcompiler_rt.so"],
@@ -3176,7 +3176,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libcutils.so-notice",
+    licenses: ["vndk-v32-libcutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3266,7 +3266,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libhardware.so-notice",
+    licenses: ["vndk-v32-libhardware.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3291,7 +3291,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libhidlbase.so-notice",
+    licenses: ["vndk-v32-libhidlbase.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3388,7 +3388,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libjsoncpp.so-notice",
+    licenses: ["vndk-v32-libjsoncpp.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3469,7 +3469,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libutils.so-notice",
+    licenses: ["vndk-v32-libutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3495,7 +3495,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libutilscallstack.so-notice",
+    licenses: ["vndk-v32-libutilscallstack.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3521,7 +3521,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libz.so-notice",
+    licenses: ["vndk-v32-libz.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3631,7 +3631,7 @@
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libbinder_ndk.so-notice",
+    licenses: ["vndk-v32-libbinder_ndk.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3650,7 +3650,7 @@
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libc.so-notice",
+    licenses: ["vndk-v32-libc.so-license"],
     arch: {
         x86: {
             export_system_include_dirs: [
@@ -3700,7 +3700,7 @@
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libdl.so-notice",
+    licenses: ["vndk-v32-libdl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86/shared/llndk-stub/libdl.so"],
@@ -3714,7 +3714,7 @@
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libft2.so-notice",
+    licenses: ["vndk-v32-libft2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3731,7 +3731,7 @@
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-liblog.so-notice",
+    licenses: ["vndk-v32-liblog.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3748,7 +3748,7 @@
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libm.so-notice",
+    licenses: ["vndk-v32-libm.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86/shared/llndk-stub/libm.so"],
@@ -3762,7 +3762,7 @@
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libmediandk.so-notice",
+    licenses: ["vndk-v32-libmediandk.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3780,7 +3780,7 @@
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libnativewindow.so-notice",
+    licenses: ["vndk-v32-libnativewindow.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3797,7 +3797,7 @@
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libneuralnetworks.so-notice",
+    licenses: ["vndk-v32-libneuralnetworks.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3814,7 +3814,7 @@
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libselinux.so-notice",
+    licenses: ["vndk-v32-libselinux.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3831,7 +3831,7 @@
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libsync.so-notice",
+    licenses: ["vndk-v32-libsync.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index 7259193..5494019 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -1811,7 +1811,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcap.so-notice",
+    licenses: ["vndk-v32-libcap.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1932,7 +1932,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcn-cbor.so-notice",
+    licenses: ["vndk-v32-libcn-cbor.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2008,7 +2008,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcrypto.so-notice",
+    licenses: ["vndk-v32-libcrypto.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2058,7 +2058,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libcurl.so-notice",
+    licenses: ["vndk-v32-libcurl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2136,7 +2136,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libevent.so-notice",
+    licenses: ["vndk-v32-libevent.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2161,7 +2161,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libexif.so-notice",
+    licenses: ["vndk-v32-libexif.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2187,7 +2187,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libexpat.so-notice",
+    licenses: ["vndk-v32-libexpat.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2402,7 +2402,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libhardware_legacy.so-notice",
+    licenses: ["vndk-v32-libhardware_legacy.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2494,7 +2494,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libjpeg.so-notice",
+    licenses: ["vndk-v32-libjpeg.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2520,7 +2520,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libldacBT_abr.so-notice",
+    licenses: ["vndk-v32-libldacBT_abr.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2546,7 +2546,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libldacBT_enc.so-notice",
+    licenses: ["vndk-v32-libldacBT_enc.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2572,7 +2572,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-liblz4.so-notice",
+    licenses: ["vndk-v32-liblz4.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2621,7 +2621,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libmedia_omx.so-notice",
+    licenses: ["vndk-v32-libmedia_omx.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2769,7 +2769,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libminijail.so-notice",
+    licenses: ["vndk-v32-libminijail.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2818,7 +2818,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libnetutils.so-notice",
+    licenses: ["vndk-v32-libnetutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2844,7 +2844,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libnl.so-notice",
+    licenses: ["vndk-v32-libnl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2870,7 +2870,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpcre2.so-notice",
+    licenses: ["vndk-v32-libpcre2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2896,7 +2896,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpiex.so-notice",
+    licenses: ["vndk-v32-libpiex.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2922,7 +2922,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpng.so-notice",
+    licenses: ["vndk-v32-libpng.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2947,7 +2947,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libpower.so-notice",
+    licenses: ["vndk-v32-libpower.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3024,7 +3024,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libspeexresampler.so-notice",
+    licenses: ["vndk-v32-libspeexresampler.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3049,7 +3049,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libsqlite.so-notice",
+    licenses: ["vndk-v32-libsqlite.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3075,7 +3075,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libssl.so-notice",
+    licenses: ["vndk-v32-libssl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3246,7 +3246,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v32-libstagefright_foundation.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3289,7 +3289,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libstagefright_omx.so-notice",
+    licenses: ["vndk-v32-libstagefright_omx.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3336,7 +3336,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v32-libstagefright_omx_utils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3510,7 +3510,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libtinyalsa.so-notice",
+    licenses: ["vndk-v32-libtinyalsa.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3536,7 +3536,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libtinyxml2.so-notice",
+    licenses: ["vndk-v32-libtinyxml2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3561,7 +3561,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libui.so-notice",
+    licenses: ["vndk-v32-libui.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3710,7 +3710,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libxml2.so-notice",
+    licenses: ["vndk-v32-libxml2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3736,7 +3736,7 @@
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v32-libyuv.so-notice",
+    licenses: ["vndk-v32-libyuv.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4682,7 +4682,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libbase.so-notice",
+    licenses: ["vndk-v32-libbase.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4736,7 +4736,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v32-libblas.so-notice",
+    licenses: ["vndk-v32-libblas.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4763,7 +4763,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libc++.so-notice",
+    licenses: ["vndk-v32-libc++.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4793,7 +4793,7 @@
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v32-libcompiler_rt.so-notice",
+    licenses: ["vndk-v32-libcompiler_rt.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libcompiler_rt.so"],
@@ -4814,7 +4814,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libcutils.so-notice",
+    licenses: ["vndk-v32-libcutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4954,7 +4954,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libhardware.so-notice",
+    licenses: ["vndk-v32-libhardware.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4989,7 +4989,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libhidlbase.so-notice",
+    licenses: ["vndk-v32-libhidlbase.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5140,7 +5140,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libjsoncpp.so-notice",
+    licenses: ["vndk-v32-libjsoncpp.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5245,7 +5245,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libutils.so-notice",
+    licenses: ["vndk-v32-libutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5282,7 +5282,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libutilscallstack.so-notice",
+    licenses: ["vndk-v32-libutilscallstack.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5319,7 +5319,7 @@
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v32-libz.so-notice",
+    licenses: ["vndk-v32-libz.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5468,7 +5468,7 @@
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libbinder_ndk.so-notice",
+    licenses: ["vndk-v32-libbinder_ndk.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5495,7 +5495,7 @@
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libc.so-notice",
+    licenses: ["vndk-v32-libc.so-license"],
     arch: {
         x86: {
             export_system_include_dirs: [
@@ -5574,7 +5574,7 @@
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libdl.so-notice",
+    licenses: ["vndk-v32-libdl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/llndk-stub/libdl.so"],
@@ -5591,7 +5591,7 @@
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libft2.so-notice",
+    licenses: ["vndk-v32-libft2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5614,7 +5614,7 @@
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-liblog.so-notice",
+    licenses: ["vndk-v32-liblog.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5637,7 +5637,7 @@
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libm.so-notice",
+    licenses: ["vndk-v32-libm.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/llndk-stub/libm.so"],
@@ -5654,7 +5654,7 @@
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libmediandk.so-notice",
+    licenses: ["vndk-v32-libmediandk.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5679,7 +5679,7 @@
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libnativewindow.so-notice",
+    licenses: ["vndk-v32-libnativewindow.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5702,7 +5702,7 @@
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libneuralnetworks.so-notice",
+    licenses: ["vndk-v32-libneuralnetworks.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5725,7 +5725,7 @@
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libselinux.so-notice",
+    licenses: ["vndk-v32-libselinux.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5748,7 +5748,7 @@
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v32-libsync.so-notice",
+    licenses: ["vndk-v32-libsync.so-license"],
     arch: {
         x86: {
             export_include_dirs: [