Replace obsolete notice property with licenses

Declare `license {}` modules instead of `filegroup {}` modules.

Reference the `license {}` modules using the `licenses:` property.

Bug: 192434786

Test: m droid dist
Change-Id: I5e2cc8b9d673b5ecfc1f9a40707260a3aaa10b5d

5 files changed, 476 insertions, 373 deletions

diff --git a/arm/Android.bp b/arm/Android.bp
index be65d32..f99cb29 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -1820,7 +1820,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcap.so-notice",
+    licenses: ["vndk-v33-libcap.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1855,7 +1855,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcn-cbor.so-notice",
+    licenses: ["vndk-v33-libcn-cbor.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1908,7 +1908,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcrypto.so-notice",
+    licenses: ["vndk-v33-libcrypto.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -1946,7 +1946,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcurl.so-notice",
+    licenses: ["vndk-v33-libcurl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2004,7 +2004,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libevent.so-notice",
+    licenses: ["vndk-v33-libevent.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2023,7 +2023,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libexif.so-notice",
+    licenses: ["vndk-v33-libexif.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2043,7 +2043,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libexpat.so-notice",
+    licenses: ["vndk-v33-libexpat.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2179,7 +2179,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libhardware_legacy.so-notice",
+    licenses: ["vndk-v33-libhardware_legacy.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2238,7 +2238,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libjpeg.so-notice",
+    licenses: ["vndk-v33-libjpeg.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2258,7 +2258,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libldacBT_abr.so-notice",
+    licenses: ["vndk-v33-libldacBT_abr.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2278,7 +2278,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libldacBT_enc.so-notice",
+    licenses: ["vndk-v33-libldacBT_enc.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2298,7 +2298,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-liblz4.so-notice",
+    licenses: ["vndk-v33-liblz4.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2335,7 +2335,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libmedia_omx.so-notice",
+    licenses: ["vndk-v33-libmedia_omx.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2423,7 +2423,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libminijail.so-notice",
+    licenses: ["vndk-v33-libminijail.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2460,7 +2460,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libnetutils.so-notice",
+    licenses: ["vndk-v33-libnetutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2480,7 +2480,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libnl.so-notice",
+    licenses: ["vndk-v33-libnl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2500,7 +2500,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpcre2.so-notice",
+    licenses: ["vndk-v33-libpcre2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2520,7 +2520,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpiex.so-notice",
+    licenses: ["vndk-v33-libpiex.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2540,7 +2540,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpng.so-notice",
+    licenses: ["vndk-v33-libpng.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2559,7 +2559,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpower.so-notice",
+    licenses: ["vndk-v33-libpower.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2617,7 +2617,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libspeexresampler.so-notice",
+    licenses: ["vndk-v33-libspeexresampler.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2636,7 +2636,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libsqlite.so-notice",
+    licenses: ["vndk-v33-libsqlite.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2656,7 +2656,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libssl.so-notice",
+    licenses: ["vndk-v33-libssl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2760,7 +2760,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v33-libstagefright_foundation.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2790,7 +2790,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libstagefright_omx.so-notice",
+    licenses: ["vndk-v33-libstagefright_omx.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2822,7 +2822,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v33-libstagefright_omx_utils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2929,7 +2929,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libtinyalsa.so-notice",
+    licenses: ["vndk-v33-libtinyalsa.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2949,7 +2949,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libtinyxml2.so-notice",
+    licenses: ["vndk-v33-libtinyxml2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2968,7 +2968,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libui.so-notice",
+    licenses: ["vndk-v33-libui.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3063,7 +3063,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libxml2.so-notice",
+    licenses: ["vndk-v33-libxml2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3083,7 +3083,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libyuv.so-notice",
+    licenses: ["vndk-v33-libyuv.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3747,7 +3747,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libbase.so-notice",
+    licenses: ["vndk-v33-libbase.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3788,7 +3788,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v33-libblas.so-notice",
+    licenses: ["vndk-v33-libblas.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3809,7 +3809,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libc++.so-notice",
+    licenses: ["vndk-v33-libc++.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3832,7 +3832,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v33-libcompiler_rt.so-notice",
+    licenses: ["vndk-v33-libcompiler_rt.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"],
@@ -3850,7 +3850,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libcutils.so-notice",
+    licenses: ["vndk-v33-libcutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3940,7 +3940,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libhardware.so-notice",
+    licenses: ["vndk-v33-libhardware.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3965,7 +3965,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libhidlbase.so-notice",
+    licenses: ["vndk-v33-libhidlbase.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4062,7 +4062,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libjsoncpp.so-notice",
+    licenses: ["vndk-v33-libjsoncpp.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4143,7 +4143,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libutils.so-notice",
+    licenses: ["vndk-v33-libutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4171,7 +4171,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libutilscallstack.so-notice",
+    licenses: ["vndk-v33-libutilscallstack.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4199,7 +4199,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libz.so-notice",
+    licenses: ["vndk-v33-libz.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4309,7 +4309,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libbinder_ndk.so-notice",
+    licenses: ["vndk-v33-libbinder_ndk.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4328,7 +4328,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libc.so-notice",
+    licenses: ["vndk-v33-libc.so-license"],
     arch: {
         arm: {
             export_system_include_dirs: [
@@ -4378,7 +4378,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libdl.so-notice",
+    licenses: ["vndk-v33-libdl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/llndk-stub/libdl.so"],
@@ -4392,7 +4392,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libft2.so-notice",
+    licenses: ["vndk-v33-libft2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4409,7 +4409,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-liblog.so-notice",
+    licenses: ["vndk-v33-liblog.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4426,7 +4426,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libm.so-notice",
+    licenses: ["vndk-v33-libm.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv7-a-neon/shared/llndk-stub/libm.so"],
@@ -4440,7 +4440,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libmediandk.so-notice",
+    licenses: ["vndk-v33-libmediandk.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4458,7 +4458,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libnativewindow.so-notice",
+    licenses: ["vndk-v33-libnativewindow.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4475,7 +4475,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libneuralnetworks.so-notice",
+    licenses: ["vndk-v33-libneuralnetworks.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4492,7 +4492,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libselinux.so-notice",
+    licenses: ["vndk-v33-libselinux.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4509,7 +4509,7 @@ vndk_prebuilt_shared {
     target_arch: "arm",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libsync.so-notice",
+    licenses: ["vndk-v33-libsync.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 7652420..6ef8a08 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -2757,7 +2757,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcap.so-notice",
+    licenses: ["vndk-v33-libcap.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2801,7 +2801,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcn-cbor.so-notice",
+    licenses: ["vndk-v33-libcn-cbor.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2881,7 +2881,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcrypto.so-notice",
+    licenses: ["vndk-v33-libcrypto.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -2931,7 +2931,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcurl.so-notice",
+    licenses: ["vndk-v33-libcurl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3009,7 +3009,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libevent.so-notice",
+    licenses: ["vndk-v33-libevent.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3034,7 +3034,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libexif.so-notice",
+    licenses: ["vndk-v33-libexif.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3060,7 +3060,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libexpat.so-notice",
+    licenses: ["vndk-v33-libexpat.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3281,7 +3281,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libhardware_legacy.so-notice",
+    licenses: ["vndk-v33-libhardware_legacy.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3373,7 +3373,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libjpeg.so-notice",
+    licenses: ["vndk-v33-libjpeg.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3399,7 +3399,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libldacBT_abr.so-notice",
+    licenses: ["vndk-v33-libldacBT_abr.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3425,7 +3425,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libldacBT_enc.so-notice",
+    licenses: ["vndk-v33-libldacBT_enc.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3451,7 +3451,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-liblz4.so-notice",
+    licenses: ["vndk-v33-liblz4.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3500,7 +3500,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libmedia_omx.so-notice",
+    licenses: ["vndk-v33-libmedia_omx.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3650,7 +3650,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libminijail.so-notice",
+    licenses: ["vndk-v33-libminijail.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3699,7 +3699,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libnetutils.so-notice",
+    licenses: ["vndk-v33-libnetutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3725,7 +3725,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libnl.so-notice",
+    licenses: ["vndk-v33-libnl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3751,7 +3751,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpcre2.so-notice",
+    licenses: ["vndk-v33-libpcre2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3777,7 +3777,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpiex.so-notice",
+    licenses: ["vndk-v33-libpiex.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3803,7 +3803,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpng.so-notice",
+    licenses: ["vndk-v33-libpng.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3828,7 +3828,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpower.so-notice",
+    licenses: ["vndk-v33-libpower.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3905,7 +3905,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libspeexresampler.so-notice",
+    licenses: ["vndk-v33-libspeexresampler.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3930,7 +3930,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libsqlite.so-notice",
+    licenses: ["vndk-v33-libsqlite.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -3956,7 +3956,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libssl.so-notice",
+    licenses: ["vndk-v33-libssl.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4127,7 +4127,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v33-libstagefright_foundation.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4174,7 +4174,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libstagefright_omx.so-notice",
+    licenses: ["vndk-v33-libstagefright_omx.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4225,7 +4225,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v33-libstagefright_omx_utils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4401,7 +4401,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libtinyalsa.so-notice",
+    licenses: ["vndk-v33-libtinyalsa.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4427,7 +4427,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libtinyxml2.so-notice",
+    licenses: ["vndk-v33-libtinyxml2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4452,7 +4452,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libui.so-notice",
+    licenses: ["vndk-v33-libui.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4603,7 +4603,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libxml2.so-notice",
+    licenses: ["vndk-v33-libxml2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -4629,7 +4629,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libyuv.so-notice",
+    licenses: ["vndk-v33-libyuv.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5643,7 +5643,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libbase.so-notice",
+    licenses: ["vndk-v33-libbase.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5697,7 +5697,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v33-libblas.so-notice",
+    licenses: ["vndk-v33-libblas.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5724,7 +5724,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libc++.so-notice",
+    licenses: ["vndk-v33-libc++.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5754,7 +5754,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v33-libcompiler_rt.so-notice",
+    licenses: ["vndk-v33-libcompiler_rt.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libcompiler_rt.so"],
@@ -5775,7 +5775,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libcutils.so-notice",
+    licenses: ["vndk-v33-libcutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5915,7 +5915,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libhardware.so-notice",
+    licenses: ["vndk-v33-libhardware.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -5950,7 +5950,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libhidlbase.so-notice",
+    licenses: ["vndk-v33-libhidlbase.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -6101,7 +6101,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libjsoncpp.so-notice",
+    licenses: ["vndk-v33-libjsoncpp.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -6206,7 +6206,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libutils.so-notice",
+    licenses: ["vndk-v33-libutils.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -6247,7 +6247,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libutilscallstack.so-notice",
+    licenses: ["vndk-v33-libutilscallstack.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -6288,7 +6288,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libz.so-notice",
+    licenses: ["vndk-v33-libz.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -6437,7 +6437,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libbinder_ndk.so-notice",
+    licenses: ["vndk-v33-libbinder_ndk.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -6464,7 +6464,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libc.so-notice",
+    licenses: ["vndk-v33-libc.so-license"],
     arch: {
         arm: {
             export_system_include_dirs: [
@@ -6546,7 +6546,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libdl.so-notice",
+    licenses: ["vndk-v33-libdl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/llndk-stub/libdl.so"],
@@ -6563,7 +6563,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libft2.so-notice",
+    licenses: ["vndk-v33-libft2.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -6586,7 +6586,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-liblog.so-notice",
+    licenses: ["vndk-v33-liblog.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -6609,7 +6609,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libm.so-notice",
+    licenses: ["vndk-v33-libm.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/llndk-stub/libm.so"],
@@ -6626,7 +6626,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libmediandk.so-notice",
+    licenses: ["vndk-v33-libmediandk.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -6651,7 +6651,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libnativewindow.so-notice",
+    licenses: ["vndk-v33-libnativewindow.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -6674,7 +6674,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libneuralnetworks.so-notice",
+    licenses: ["vndk-v33-libneuralnetworks.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -6697,7 +6697,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libselinux.so-notice",
+    licenses: ["vndk-v33-libselinux.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
@@ -6720,7 +6720,7 @@ vndk_prebuilt_shared {
     target_arch: "arm64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libsync.so-notice",
+    licenses: ["vndk-v33-libsync.so-license"],
     arch: {
         arm: {
             export_include_dirs: [
diff --git a/common/Android.bp b/common/Android.bp
index 75c67a3..7666f0f 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -5,267 +5,370 @@ package {
     default_applicable_licenses: ["prebuilts_vndk_v33_license"],
 }
 
-filegroup {
-    name: "vndk-v33-libbase.so-notice",
-    srcs: ["NOTICE_FILES/libbase.so.txt"],
+license {
+    name: "vndk-v33-libbase.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+    ],
+    license_text: ["NOTICE_FILES/libbase.so.txt"],
+}
+
+license {
+    name: "vndk-v33-libbinder_ndk.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libbinder_ndk.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libbinder_ndk.so-notice",
-    srcs: ["NOTICE_FILES/libbinder_ndk.so.txt"],
+license {
+    name: "vndk-v33-libblas.so-license",
+    license_kinds: ["legacy_notice"],
+    license_text: ["NOTICE_FILES/libblas.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libblas.so-notice",
-    srcs: ["NOTICE_FILES/libblas.so.txt"],
+license {
+    name: "vndk-v33-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-v33-libc++.so-notice",
-    srcs: ["NOTICE_FILES/libc++.so.txt"],
+license {
+    name: "vndk-v33-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-v33-libc.so-notice",
-    srcs: ["NOTICE_FILES/libc.so.txt"],
+license {
+    name: "vndk-v33-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-v33-libcap.so-notice",
-    srcs: ["NOTICE_FILES/libcap.so.txt"],
+license {
+    name: "vndk-v33-libcn-cbor.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libcn-cbor.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libcn-cbor.so-notice",
-    srcs: ["NOTICE_FILES/libcn-cbor.so.txt"],
+license {
+    name: "vndk-v33-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-v33-libcompiler_rt.so-notice",
-    srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"],
+license {
+    name: "vndk-v33-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-v33-libcrypto.so-notice",
-    srcs: ["NOTICE_FILES/libcrypto.so.txt"],
+license {
+    name: "vndk-v33-libcurl.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libcurl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libcurl.so-notice",
-    srcs: ["NOTICE_FILES/libcurl.so.txt"],
+license {
+    name: "vndk-v33-libcutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libcutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libcutils.so-notice",
-    srcs: ["NOTICE_FILES/libcutils.so.txt"],
+license {
+    name: "vndk-v33-libdl.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libdl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libdl.so-notice",
-    srcs: ["NOTICE_FILES/libdl.so.txt"],
+license {
+    name: "vndk-v33-libevent.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: ["NOTICE_FILES/libevent.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libevent.so-notice",
-    srcs: ["NOTICE_FILES/libevent.so.txt"],
+license {
+    name: "vndk-v33-libexif.so-license",
+    license_kinds: ["SPDX-license-identifier-LGPL-2.1"],
+    license_text: ["NOTICE_FILES/libexif.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libexif.so-notice",
-    srcs: ["NOTICE_FILES/libexif.so.txt"],
+license {
+    name: "vndk-v33-libexpat.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libexpat.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libexpat.so-notice",
-    srcs: ["NOTICE_FILES/libexpat.so.txt"],
+license {
+    name: "vndk-v33-libft2.so-license",
+    license_kinds: ["SPDX-license-identifier-FTL"],
+    license_text: ["NOTICE_FILES/libft2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libft2.so-notice",
-    srcs: ["NOTICE_FILES/libft2.so.txt"],
+license {
+    name: "vndk-v33-libhardware.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhardware.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libhardware.so-notice",
-    srcs: ["NOTICE_FILES/libhardware.so.txt"],
+license {
+    name: "vndk-v33-libhardware_legacy.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhardware_legacy.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libhardware_legacy.so-notice",
-    srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"],
+license {
+    name: "vndk-v33-libhidlbase.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libhidlbase.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libhidlbase.so-notice",
-    srcs: ["NOTICE_FILES/libhidlbase.so.txt"],
+license {
+    name: "vndk-v33-libjpeg.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-Zlib",
+    ],
+    license_text: ["NOTICE_FILES/libjpeg.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libjpeg.so-notice",
-    srcs: ["NOTICE_FILES/libjpeg.so.txt"],
+license {
+    name: "vndk-v33-libjsoncpp.so-license",
+    license_kinds: [
+        "SPDX-license-identifier-MIT",
+        "legacy_unencumbered",
+    ],
+    license_text: ["NOTICE_FILES/libjsoncpp.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libjsoncpp.so-notice",
-    srcs: ["NOTICE_FILES/libjsoncpp.so.txt"],
+license {
+    name: "vndk-v33-libldacBT_abr.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libldacBT_abr.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libldacBT_abr.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"],
+license {
+    name: "vndk-v33-libldacBT_enc.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libldacBT_enc.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libldacBT_enc.so-notice",
-    srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"],
+license {
+    name: "vndk-v33-liblog.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/liblog.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-liblog.so-notice",
-    srcs: ["NOTICE_FILES/liblog.so.txt"],
+license {
+    name: "vndk-v33-liblz4.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/liblz4.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-liblz4.so-notice",
-    srcs: ["NOTICE_FILES/liblz4.so.txt"],
+license {
+    name: "vndk-v33-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-v33-libm.so-notice",
-    srcs: ["NOTICE_FILES/libm.so.txt"],
+license {
+    name: "vndk-v33-libmedia_omx.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libmedia_omx.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libmedia_omx.so-notice",
-    srcs: ["NOTICE_FILES/libmedia_omx.so.txt"],
+license {
+    name: "vndk-v33-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-v33-libmediandk.so-notice",
-    srcs: ["NOTICE_FILES/libmediandk.so.txt"],
+license {
+    name: "vndk-v33-libminijail.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libminijail.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libminijail.so-notice",
-    srcs: ["NOTICE_FILES/libminijail.so.txt"],
+license {
+    name: "vndk-v33-libnativewindow.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libnativewindow.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libnativewindow.so-notice",
-    srcs: ["NOTICE_FILES/libnativewindow.so.txt"],
+license {
+    name: "vndk-v33-libnetutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libnetutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libnetutils.so-notice",
-    srcs: ["NOTICE_FILES/libnetutils.so.txt"],
+license {
+    name: "vndk-v33-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-v33-libneuralnetworks.so-notice",
-    srcs: ["NOTICE_FILES/libneuralnetworks.so.txt"],
+license {
+    name: "vndk-v33-libnl.so-license",
+    license_kinds: ["SPDX-license-identifier-LGPL-2.1"],
+    license_text: ["NOTICE_FILES/libnl.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libnl.so-notice",
-    srcs: ["NOTICE_FILES/libnl.so.txt"],
+license {
+    name: "vndk-v33-libpcre2.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libpcre2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libpcre2.so-notice",
-    srcs: ["NOTICE_FILES/libpcre2.so.txt"],
+license {
+    name: "vndk-v33-libpiex.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libpiex.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libpiex.so-notice",
-    srcs: ["NOTICE_FILES/libpiex.so.txt"],
+license {
+    name: "vndk-v33-libpng.so-license",
+    license_kinds: ["legacy_notice"],
+    license_text: ["NOTICE_FILES/libpng.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libpng.so-notice",
-    srcs: ["NOTICE_FILES/libpng.so.txt"],
+license {
+    name: "vndk-v33-libpower.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libpower.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libpower.so-notice",
-    srcs: ["NOTICE_FILES/libpower.so.txt"],
+license {
+    name: "vndk-v33-libselinux.so-license",
+    license_kinds: ["legacy_unencumbered"],
+    license_text: ["NOTICE_FILES/libselinux.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libselinux.so-notice",
-    srcs: ["NOTICE_FILES/libselinux.so.txt"],
+license {
+    name: "vndk-v33-libspeexresampler.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libspeexresampler.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libspeexresampler.so-notice",
-    srcs: ["NOTICE_FILES/libspeexresampler.so.txt"],
+license {
+    name: "vndk-v33-libsqlite.so-license",
+    license_kinds: ["legacy_permissive"],
+    license_text: ["NOTICE_FILES/libsqlite.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libsqlite.so-notice",
-    srcs: ["NOTICE_FILES/libsqlite.so.txt"],
+license {
+    name: "vndk-v33-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-v33-libssl.so-notice",
-    srcs: ["NOTICE_FILES/libssl.so.txt"],
+license {
+    name: "vndk-v33-libstagefright_foundation.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libstagefright_foundation.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"],
+license {
+    name: "vndk-v33-libstagefright_omx.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libstagefright_omx.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libstagefright_omx.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"],
+license {
+    name: "vndk-v33-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-v33-libstagefright_omx_utils.so-notice",
-    srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"],
+license {
+    name: "vndk-v33-libsync.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libsync.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libsync.so-notice",
-    srcs: ["NOTICE_FILES/libsync.so.txt"],
+license {
+    name: "vndk-v33-libtinyalsa.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libtinyalsa.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libtinyalsa.so-notice",
-    srcs: ["NOTICE_FILES/libtinyalsa.so.txt"],
+license {
+    name: "vndk-v33-libtinyxml2.so-license",
+    license_kinds: ["SPDX-license-identifier-Zlib"],
+    license_text: ["NOTICE_FILES/libtinyxml2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libtinyxml2.so-notice",
-    srcs: ["NOTICE_FILES/libtinyxml2.so.txt"],
+license {
+    name: "vndk-v33-libui.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libui.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libui.so-notice",
-    srcs: ["NOTICE_FILES/libui.so.txt"],
+license {
+    name: "vndk-v33-libutils.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libutils.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libutils.so-notice",
-    srcs: ["NOTICE_FILES/libutils.so.txt"],
+license {
+    name: "vndk-v33-libutilscallstack.so-license",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["NOTICE_FILES/libutilscallstack.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libutilscallstack.so-notice",
-    srcs: ["NOTICE_FILES/libutilscallstack.so.txt"],
+license {
+    name: "vndk-v33-libxml2.so-license",
+    license_kinds: ["SPDX-license-identifier-MIT"],
+    license_text: ["NOTICE_FILES/libxml2.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libxml2.so-notice",
-    srcs: ["NOTICE_FILES/libxml2.so.txt"],
+license {
+    name: "vndk-v33-libyuv.so-license",
+    license_kinds: ["SPDX-license-identifier-BSD"],
+    license_text: ["NOTICE_FILES/libyuv.so.txt"],
 }
 
-filegroup {
-    name: "vndk-v33-libyuv.so-notice",
-    srcs: ["NOTICE_FILES/libyuv.so.txt"],
-}
-
-filegroup {
-    name: "vndk-v33-libz.so-notice",
-    srcs: ["NOTICE_FILES/libz.so.txt"],
+license {
+    name: "vndk-v33-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 b88197a..db87ce7 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -1820,7 +1820,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcap.so-notice",
+    licenses: ["vndk-v33-libcap.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1855,7 +1855,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcn-cbor.so-notice",
+    licenses: ["vndk-v33-libcn-cbor.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1908,7 +1908,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcrypto.so-notice",
+    licenses: ["vndk-v33-libcrypto.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -1946,7 +1946,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcurl.so-notice",
+    licenses: ["vndk-v33-libcurl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2004,7 +2004,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libevent.so-notice",
+    licenses: ["vndk-v33-libevent.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2023,7 +2023,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libexif.so-notice",
+    licenses: ["vndk-v33-libexif.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2043,7 +2043,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libexpat.so-notice",
+    licenses: ["vndk-v33-libexpat.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2179,7 +2179,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libhardware_legacy.so-notice",
+    licenses: ["vndk-v33-libhardware_legacy.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2238,7 +2238,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libjpeg.so-notice",
+    licenses: ["vndk-v33-libjpeg.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2258,7 +2258,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libldacBT_abr.so-notice",
+    licenses: ["vndk-v33-libldacBT_abr.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2278,7 +2278,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libldacBT_enc.so-notice",
+    licenses: ["vndk-v33-libldacBT_enc.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2298,7 +2298,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-liblz4.so-notice",
+    licenses: ["vndk-v33-liblz4.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2335,7 +2335,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libmedia_omx.so-notice",
+    licenses: ["vndk-v33-libmedia_omx.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2423,7 +2423,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libminijail.so-notice",
+    licenses: ["vndk-v33-libminijail.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2460,7 +2460,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libnetutils.so-notice",
+    licenses: ["vndk-v33-libnetutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2480,7 +2480,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libnl.so-notice",
+    licenses: ["vndk-v33-libnl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2500,7 +2500,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpcre2.so-notice",
+    licenses: ["vndk-v33-libpcre2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2520,7 +2520,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpiex.so-notice",
+    licenses: ["vndk-v33-libpiex.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2540,7 +2540,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpng.so-notice",
+    licenses: ["vndk-v33-libpng.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2559,7 +2559,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpower.so-notice",
+    licenses: ["vndk-v33-libpower.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2617,7 +2617,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libspeexresampler.so-notice",
+    licenses: ["vndk-v33-libspeexresampler.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2636,7 +2636,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libsqlite.so-notice",
+    licenses: ["vndk-v33-libsqlite.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2656,7 +2656,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libssl.so-notice",
+    licenses: ["vndk-v33-libssl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2760,7 +2760,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v33-libstagefright_foundation.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2790,7 +2790,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libstagefright_omx.so-notice",
+    licenses: ["vndk-v33-libstagefright_omx.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2822,7 +2822,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v33-libstagefright_omx_utils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2929,7 +2929,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libtinyalsa.so-notice",
+    licenses: ["vndk-v33-libtinyalsa.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2949,7 +2949,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libtinyxml2.so-notice",
+    licenses: ["vndk-v33-libtinyxml2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2968,7 +2968,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libui.so-notice",
+    licenses: ["vndk-v33-libui.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3063,7 +3063,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libxml2.so-notice",
+    licenses: ["vndk-v33-libxml2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3083,7 +3083,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libyuv.so-notice",
+    licenses: ["vndk-v33-libyuv.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3747,7 +3747,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libbase.so-notice",
+    licenses: ["vndk-v33-libbase.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3788,7 +3788,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v33-libblas.so-notice",
+    licenses: ["vndk-v33-libblas.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3809,7 +3809,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libc++.so-notice",
+    licenses: ["vndk-v33-libc++.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3832,7 +3832,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v33-libcompiler_rt.so-notice",
+    licenses: ["vndk-v33-libcompiler_rt.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86/shared/vndk-sp/libcompiler_rt.so"],
@@ -3850,7 +3850,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libcutils.so-notice",
+    licenses: ["vndk-v33-libcutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3940,7 +3940,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libhardware.so-notice",
+    licenses: ["vndk-v33-libhardware.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3965,7 +3965,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libhidlbase.so-notice",
+    licenses: ["vndk-v33-libhidlbase.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4062,7 +4062,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libjsoncpp.so-notice",
+    licenses: ["vndk-v33-libjsoncpp.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4143,7 +4143,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libutils.so-notice",
+    licenses: ["vndk-v33-libutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4171,7 +4171,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libutilscallstack.so-notice",
+    licenses: ["vndk-v33-libutilscallstack.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4199,7 +4199,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libz.so-notice",
+    licenses: ["vndk-v33-libz.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4309,7 +4309,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libbinder_ndk.so-notice",
+    licenses: ["vndk-v33-libbinder_ndk.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4328,7 +4328,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libc.so-notice",
+    licenses: ["vndk-v33-libc.so-license"],
     arch: {
         x86: {
             export_system_include_dirs: [
@@ -4378,7 +4378,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libdl.so-notice",
+    licenses: ["vndk-v33-libdl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86/shared/llndk-stub/libdl.so"],
@@ -4392,7 +4392,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libft2.so-notice",
+    licenses: ["vndk-v33-libft2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4409,7 +4409,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-liblog.so-notice",
+    licenses: ["vndk-v33-liblog.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4426,7 +4426,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libm.so-notice",
+    licenses: ["vndk-v33-libm.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86/shared/llndk-stub/libm.so"],
@@ -4440,7 +4440,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libmediandk.so-notice",
+    licenses: ["vndk-v33-libmediandk.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4458,7 +4458,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libnativewindow.so-notice",
+    licenses: ["vndk-v33-libnativewindow.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4475,7 +4475,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libneuralnetworks.so-notice",
+    licenses: ["vndk-v33-libneuralnetworks.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4492,7 +4492,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libselinux.so-notice",
+    licenses: ["vndk-v33-libselinux.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4509,7 +4509,7 @@ vndk_prebuilt_shared {
     target_arch: "x86",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libsync.so-notice",
+    licenses: ["vndk-v33-libsync.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index 0ba81c3..948e8ea 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -2757,7 +2757,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcap.so-notice",
+    licenses: ["vndk-v33-libcap.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2801,7 +2801,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcn-cbor.so-notice",
+    licenses: ["vndk-v33-libcn-cbor.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2881,7 +2881,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcrypto.so-notice",
+    licenses: ["vndk-v33-libcrypto.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -2931,7 +2931,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libcurl.so-notice",
+    licenses: ["vndk-v33-libcurl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3009,7 +3009,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libevent.so-notice",
+    licenses: ["vndk-v33-libevent.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3034,7 +3034,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libexif.so-notice",
+    licenses: ["vndk-v33-libexif.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3060,7 +3060,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libexpat.so-notice",
+    licenses: ["vndk-v33-libexpat.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3281,7 +3281,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libhardware_legacy.so-notice",
+    licenses: ["vndk-v33-libhardware_legacy.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3373,7 +3373,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libjpeg.so-notice",
+    licenses: ["vndk-v33-libjpeg.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3399,7 +3399,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libldacBT_abr.so-notice",
+    licenses: ["vndk-v33-libldacBT_abr.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3425,7 +3425,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libldacBT_enc.so-notice",
+    licenses: ["vndk-v33-libldacBT_enc.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3451,7 +3451,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-liblz4.so-notice",
+    licenses: ["vndk-v33-liblz4.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3500,7 +3500,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libmedia_omx.so-notice",
+    licenses: ["vndk-v33-libmedia_omx.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3650,7 +3650,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libminijail.so-notice",
+    licenses: ["vndk-v33-libminijail.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3699,7 +3699,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libnetutils.so-notice",
+    licenses: ["vndk-v33-libnetutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3725,7 +3725,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libnl.so-notice",
+    licenses: ["vndk-v33-libnl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3751,7 +3751,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpcre2.so-notice",
+    licenses: ["vndk-v33-libpcre2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3777,7 +3777,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpiex.so-notice",
+    licenses: ["vndk-v33-libpiex.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3803,7 +3803,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpng.so-notice",
+    licenses: ["vndk-v33-libpng.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3828,7 +3828,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libpower.so-notice",
+    licenses: ["vndk-v33-libpower.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3905,7 +3905,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libspeexresampler.so-notice",
+    licenses: ["vndk-v33-libspeexresampler.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3930,7 +3930,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libsqlite.so-notice",
+    licenses: ["vndk-v33-libsqlite.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -3956,7 +3956,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libssl.so-notice",
+    licenses: ["vndk-v33-libssl.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4127,7 +4127,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v33-libstagefright_foundation.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4174,7 +4174,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libstagefright_omx.so-notice",
+    licenses: ["vndk-v33-libstagefright_omx.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4225,7 +4225,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v33-libstagefright_omx_utils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4401,7 +4401,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libtinyalsa.so-notice",
+    licenses: ["vndk-v33-libtinyalsa.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4427,7 +4427,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libtinyxml2.so-notice",
+    licenses: ["vndk-v33-libtinyxml2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4452,7 +4452,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libui.so-notice",
+    licenses: ["vndk-v33-libui.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4603,7 +4603,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libxml2.so-notice",
+    licenses: ["vndk-v33-libxml2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -4629,7 +4629,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v33-libyuv.so-notice",
+    licenses: ["vndk-v33-libyuv.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5643,7 +5643,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libbase.so-notice",
+    licenses: ["vndk-v33-libbase.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5697,7 +5697,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v33-libblas.so-notice",
+    licenses: ["vndk-v33-libblas.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5724,7 +5724,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libc++.so-notice",
+    licenses: ["vndk-v33-libc++.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5754,7 +5754,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v33-libcompiler_rt.so-notice",
+    licenses: ["vndk-v33-libcompiler_rt.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libcompiler_rt.so"],
@@ -5775,7 +5775,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libcutils.so-notice",
+    licenses: ["vndk-v33-libcutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5915,7 +5915,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libhardware.so-notice",
+    licenses: ["vndk-v33-libhardware.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -5950,7 +5950,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libhidlbase.so-notice",
+    licenses: ["vndk-v33-libhidlbase.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -6101,7 +6101,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libjsoncpp.so-notice",
+    licenses: ["vndk-v33-libjsoncpp.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -6206,7 +6206,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libutils.so-notice",
+    licenses: ["vndk-v33-libutils.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -6247,7 +6247,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libutilscallstack.so-notice",
+    licenses: ["vndk-v33-libutilscallstack.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -6288,7 +6288,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v33-libz.so-notice",
+    licenses: ["vndk-v33-libz.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -6437,7 +6437,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libbinder_ndk.so-notice",
+    licenses: ["vndk-v33-libbinder_ndk.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -6464,7 +6464,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libc.so-notice",
+    licenses: ["vndk-v33-libc.so-license"],
     arch: {
         x86: {
             export_system_include_dirs: [
@@ -6533,7 +6533,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libdl.so-notice",
+    licenses: ["vndk-v33-libdl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/llndk-stub/libdl.so"],
@@ -6550,7 +6550,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libft2.so-notice",
+    licenses: ["vndk-v33-libft2.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -6573,7 +6573,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-liblog.so-notice",
+    licenses: ["vndk-v33-liblog.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -6596,7 +6596,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libm.so-notice",
+    licenses: ["vndk-v33-libm.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86_64/shared/llndk-stub/libm.so"],
@@ -6613,7 +6613,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libmediandk.so-notice",
+    licenses: ["vndk-v33-libmediandk.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -6638,7 +6638,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libnativewindow.so-notice",
+    licenses: ["vndk-v33-libnativewindow.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -6661,7 +6661,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libneuralnetworks.so-notice",
+    licenses: ["vndk-v33-libneuralnetworks.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -6684,7 +6684,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libselinux.so-notice",
+    licenses: ["vndk-v33-libselinux.so-license"],
     arch: {
         x86: {
             export_include_dirs: [
@@ -6707,7 +6707,7 @@ vndk_prebuilt_shared {
     target_arch: "x86_64",
     vendor_available: true,
     product_available: true,
-    notice: ":vndk-v33-libsync.so-notice",
+    licenses: ["vndk-v33-libsync.so-license"],
     arch: {
         x86: {
             export_include_dirs: [