Snap for 10453563 from 2e659f04a7cde964415c82dd7507610769165408 to mainline-media-releaseaml_med_341711000aml_med_341619000aml_med_341513600aml_med_341312300aml_med_341312020aml_med_341111000aml_med_341011000aml_med_340922010android14-mainline-media-release

Change-Id: I0af5a73f9625a936bb6439cd6bdf01f74019e431

1 files changed, 48 insertions, 48 deletions

diff --git a/x86/Android.bp b/x86/Android.bp
index 922f9f6..72bffa1 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -2420,7 +2420,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libaudioroute.so-notice",
+    licenses: ["vndk-v29-libaudioroute.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libaudioroute.so"],
@@ -2485,7 +2485,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcap.so-notice",
+    licenses: ["vndk-v29-libcap.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcap.so"],
@@ -2582,7 +2582,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcrypto.so-notice",
+    licenses: ["vndk-v29-libcrypto.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcrypto.so"],
@@ -2615,7 +2615,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libcurl.so-notice",
+    licenses: ["vndk-v29-libcurl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libcurl.so"],
@@ -2664,7 +2664,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libevent.so-notice",
+    licenses: ["vndk-v29-libevent.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libevent.so"],
@@ -2681,7 +2681,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexif.so-notice",
+    licenses: ["vndk-v29-libexif.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libexif.so"],
@@ -2698,7 +2698,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libexpat.so-notice",
+    licenses: ["vndk-v29-libexpat.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libexpat.so"],
@@ -2764,7 +2764,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libhardware_legacy.so-notice",
+    licenses: ["vndk-v29-libhardware_legacy.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libhardware_legacy.so"],
@@ -2813,7 +2813,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libjpeg.so-notice",
+    licenses: ["vndk-v29-libjpeg.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libjpeg.so"],
@@ -2830,7 +2830,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_messages.so-notice",
+    licenses: ["vndk-v29-libkeymaster_messages.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_messages.so"],
@@ -2847,7 +2847,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libkeymaster_portable.so-notice",
+    licenses: ["vndk-v29-libkeymaster_portable.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libkeymaster_portable.so"],
@@ -2864,7 +2864,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_abr.so-notice",
+    licenses: ["vndk-v29-libldacBT_abr.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_abr.so"],
@@ -2881,7 +2881,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libldacBT_enc.so-notice",
+    licenses: ["vndk-v29-libldacBT_enc.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libldacBT_enc.so"],
@@ -2898,7 +2898,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-liblz4.so-notice",
+    licenses: ["vndk-v29-liblz4.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/liblz4.so"],
@@ -2915,7 +2915,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_helper.so-notice",
+    licenses: ["vndk-v29-libmedia_helper.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_helper.so"],
@@ -2932,7 +2932,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libmedia_omx.so-notice",
+    licenses: ["vndk-v29-libmedia_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libmedia_omx.so"],
@@ -2965,7 +2965,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libminijail.so-notice",
+    licenses: ["vndk-v29-libminijail.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libminijail.so"],
@@ -2998,7 +2998,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnetutils.so-notice",
+    licenses: ["vndk-v29-libnetutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnetutils.so"],
@@ -3015,7 +3015,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libnl.so-notice",
+    licenses: ["vndk-v29-libnl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libnl.so"],
@@ -3032,7 +3032,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpcre2.so-notice",
+    licenses: ["vndk-v29-libpcre2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpcre2.so"],
@@ -3049,7 +3049,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpiex.so-notice",
+    licenses: ["vndk-v29-libpiex.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpiex.so"],
@@ -3082,7 +3082,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpower.so-notice",
+    licenses: ["vndk-v29-libpower.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpower.so"],
@@ -3115,7 +3115,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-full.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-full.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-full.so"],
@@ -3132,7 +3132,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libprotobuf-cpp-lite.so-notice",
+    licenses: ["vndk-v29-libprotobuf-cpp-lite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libprotobuf-cpp-lite.so"],
@@ -3149,7 +3149,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libpuresoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libpuresoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libpuresoftkeymasterdevice.so"],
@@ -3198,7 +3198,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsoftkeymasterdevice.so-notice",
+    licenses: ["vndk-v29-libsoftkeymasterdevice.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsoftkeymasterdevice.so"],
@@ -3215,7 +3215,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libspeexresampler.so-notice",
+    licenses: ["vndk-v29-libspeexresampler.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libspeexresampler.so"],
@@ -3232,7 +3232,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libsqlite.so-notice",
+    licenses: ["vndk-v29-libsqlite.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libsqlite.so"],
@@ -3249,7 +3249,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libssl.so-notice",
+    licenses: ["vndk-v29-libssl.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libssl.so"],
@@ -3298,7 +3298,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_foundation.so-notice",
+    licenses: ["vndk-v29-libstagefright_foundation.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_foundation.so"],
@@ -3315,7 +3315,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx.so"],
@@ -3332,7 +3332,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libstagefright_omx_utils.so-notice",
+    licenses: ["vndk-v29-libstagefright_omx_utils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libstagefright_omx_utils.so"],
@@ -3381,7 +3381,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyalsa.so-notice",
+    licenses: ["vndk-v29-libtinyalsa.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyalsa.so"],
@@ -3398,7 +3398,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libtinyxml2.so-notice",
+    licenses: ["vndk-v29-libtinyxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libtinyxml2.so"],
@@ -3415,7 +3415,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libui.so-notice",
+    licenses: ["vndk-v29-libui.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libui.so"],
@@ -3464,7 +3464,7 @@ vndk_prebuilt_shared {
     vndk: {
         enabled: true,
     },
-    notice: ":vndk-v29-libxml2.so-notice",
+    licenses: ["vndk-v29-libxml2.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-core/libxml2.so"],
@@ -3824,7 +3824,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libblas.so-notice",
+    licenses: ["vndk-v29-libblas.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libblas.so"],
@@ -3842,7 +3842,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libc++.so-notice",
+    licenses: ["vndk-v29-libc++.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libc++.so"],
@@ -3861,7 +3861,7 @@ vndk_prebuilt_shared {
         support_system_process: true,
         private: true,
     },
-    notice: ":vndk-v29-libcompiler_rt.so-notice",
+    licenses: ["vndk-v29-libcompiler_rt.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcompiler_rt.so"],
@@ -3879,7 +3879,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libcutils.so-notice",
+    licenses: ["vndk-v29-libcutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libcutils.so"],
@@ -3897,7 +3897,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhardware.so-notice",
+    licenses: ["vndk-v29-libhardware.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhardware.so"],
@@ -3915,7 +3915,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidlbase.so-notice",
+    licenses: ["vndk-v29-libhidlbase.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhidlbase.so"],
@@ -3950,7 +3950,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhidltransport.so-notice",
+    licenses: ["vndk-v29-libhidltransport.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhidltransport.so"],
@@ -3968,7 +3968,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder.so-notice",
+    licenses: ["vndk-v29-libhwbinder.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder.so"],
@@ -3986,7 +3986,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libhwbinder_noltopgo.so-notice",
+    licenses: ["vndk-v29-libhwbinder_noltopgo.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libhwbinder_noltopgo.so"],
@@ -4089,7 +4089,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutils.so-notice",
+    licenses: ["vndk-v29-libutils.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutils.so"],
@@ -4107,7 +4107,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libutilscallstack.so-notice",
+    licenses: ["vndk-v29-libutilscallstack.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libutilscallstack.so"],
@@ -4125,7 +4125,7 @@ vndk_prebuilt_shared {
         enabled: true,
         support_system_process: true,
     },
-    notice: ":vndk-v29-libz.so-notice",
+    licenses: ["vndk-v29-libz.so-license"],
     arch: {
         x86: {
             srcs: ["arch-x86-x86/shared/vndk-sp/libz.so"],