1 files changed, 48 insertions, 48 deletions

diff --git a/arm64/Android.bp b/arm64/Android.bp
index 81b6667..330a0ad 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -2870,7 +2870,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libaudioroute.so-notice",
+    licenses: ["vndk-v29-libaudioroute.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libaudioroute.so"],
@@ -2947,7 +2947,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcap.so-notice",
+    licenses: ["vndk-v29-libcap.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcap.so"],
@@ -3101,7 +3101,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcrypto.so-notice",
+    licenses: ["vndk-v29-libcrypto.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcrypto.so"],
@@ -3140,7 +3140,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcurl.so-notice",
+    licenses: ["vndk-v29-libcurl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcurl.so"],
@@ -3198,7 +3198,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libevent.so-notice",
+    licenses: ["vndk-v29-libevent.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libevent.so"],
@@ -3218,7 +3218,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexif.so-notice",
+    licenses: ["vndk-v29-libexif.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libexif.so"],
@@ -3238,7 +3238,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexpat.so-notice",
+    licenses: ["vndk-v29-libexpat.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libexpat.so"],
@@ -3316,7 +3316,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libhardware_legacy.so-notice",
+    licenses: ["vndk-v29-libhardware_legacy.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libhardware_legacy.so"],
@@ -3374,7 +3374,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libjpeg.so-notice",
+    licenses: ["vndk-v29-libjpeg.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libjpeg.so"],
@@ -3394,7 +3394,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v29-libkeymaster_messages.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libkeymaster_messages.so"],
@@ -3414,7 +3414,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v29-libkeymaster_portable.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libkeymaster_portable.so"],
@@ -3434,7 +3434,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_abr.so-notice",
+    licenses: ["vndk-v29-libldacBT_abr.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libldacBT_abr.so"],
@@ -3454,7 +3454,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_enc.so-notice",
+    licenses: ["vndk-v29-libldacBT_enc.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libldacBT_enc.so"],
@@ -3474,7 +3474,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-liblz4.so-notice",
+    licenses: ["vndk-v29-liblz4.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/liblz4.so"],
@@ -3494,7 +3494,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_helper.so-notice",
+    licenses: ["vndk-v29-libmedia_helper.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so"],
@@ -3514,7 +3514,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_omx.so-notice",
+    licenses: ["vndk-v29-libmedia_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libmedia_omx.so"],
@@ -3553,7 +3553,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libminijail.so-notice",
+    licenses: ["vndk-v29-libminijail.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libminijail.so"],
@@ -3592,7 +3592,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnetutils.so-notice",
+    licenses: ["vndk-v29-libnetutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libnetutils.so"],
@@ -3612,7 +3612,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnl.so-notice",
+    licenses: ["vndk-v29-libnl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libnl.so"],
@@ -3632,7 +3632,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpcre2.so-notice",
+    licenses: ["vndk-v29-libpcre2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpcre2.so"],
@@ -3652,7 +3652,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpiex.so-notice",
+    licenses: ["vndk-v29-libpiex.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpiex.so"],
@@ -3691,7 +3691,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpower.so-notice",
+    licenses: ["vndk-v29-libpower.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpower.so"],
@@ -3730,7 +3730,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-full.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -3750,7 +3750,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-lite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -3770,7 +3770,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libpuresoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -3828,7 +3828,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libsoftkeymasterdevice.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -3848,7 +3848,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libspeexresampler.so-notice",
+    licenses: ["vndk-v29-libspeexresampler.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libspeexresampler.so"],
@@ -3868,7 +3868,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsqlite.so-notice",
+    licenses: ["vndk-v29-libsqlite.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libsqlite.so"],
@@ -3888,7 +3888,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libssl.so-notice",
+    licenses: ["vndk-v29-libssl.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libssl.so"],
@@ -3946,7 +3946,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v29-libstagefright_foundation.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_foundation.so"],
@@ -3966,7 +3966,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_omx.so"],
@@ -3986,7 +3986,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx_utils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -4044,7 +4044,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyalsa.so-notice",
+    licenses: ["vndk-v29-libtinyalsa.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libtinyalsa.so"],
@@ -4064,7 +4064,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyxml2.so-notice",
+    licenses: ["vndk-v29-libtinyxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libtinyxml2.so"],
@@ -4084,7 +4084,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libui.so-notice",
+    licenses: ["vndk-v29-libui.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libui.so"],
@@ -4142,7 +4142,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libxml2.so-notice",
+    licenses: ["vndk-v29-libxml2.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libxml2.so"],
@@ -4566,7 +4566,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libblas.so-notice",
+    licenses: ["vndk-v29-libblas.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libblas.so"],
@@ -4587,7 +4587,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libc++.so-notice",
+    licenses: ["vndk-v29-libc++.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libc++.so"],
@@ -4609,7 +4609,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libcompiler_rt.so-notice",
+    licenses: ["vndk-v29-libcompiler_rt.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libcompiler_rt.so"],
@@ -4630,7 +4630,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libcutils.so-notice",
+    licenses: ["vndk-v29-libcutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libcutils.so"],
@@ -4651,7 +4651,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhardware.so-notice",
+    licenses: ["vndk-v29-libhardware.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhardware.so"],
@@ -4672,7 +4672,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidlbase.so-notice",
+    licenses: ["vndk-v29-libhidlbase.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so"],
@@ -4713,7 +4713,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidltransport.so-notice",
+    licenses: ["vndk-v29-libhidltransport.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhidltransport.so"],
@@ -4734,7 +4734,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder.so-notice",
+    licenses: ["vndk-v29-libhwbinder.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhwbinder.so"],
@@ -4755,7 +4755,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v29-libhwbinder_noltopgo.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -4876,7 +4876,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutils.so-notice",
+    licenses: ["vndk-v29-libutils.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libutils.so"],
@@ -4897,7 +4897,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutilscallstack.so-notice",
+    licenses: ["vndk-v29-libutilscallstack.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libutilscallstack.so"],
@@ -4918,7 +4918,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libz.so-notice",
+    licenses: ["vndk-v29-libz.so-license"],
     arch: {
         arm: {
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libz.so"],