diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:06:27 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:06:27 +0000 |
commit | fe46f676b691ea3fe6bdeaa492103dd7c6f6f30e (patch) | |
tree | 071ac645a530574f676c86aaf352d948896f172f | |
parent | 032161436d9e4f0616320fb738deee9f512587f1 (diff) | |
parent | b2a975dfb122d37c37af780be63a9faf8d76d143 (diff) | |
download | v30-android14-mainline-mediaprovider-release.tar.gz |
Snap for 10453563 from b2a975dfb122d37c37af780be63a9faf8d76d143 to mainline-mediaprovider-releaseaml_mpr_341614010aml_mpr_341511070aml_mpr_341411070aml_mpr_341313030aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000android14-mainline-mediaprovider-release
Change-Id: I24cab049049b9dd987cfd0244148e8da068c772f
-rw-r--r-- | arm/Android.bp | 78 | ||||
-rw-r--r-- | arm64/Android.bp | 78 | ||||
-rw-r--r-- | common/Android.bp | 305 | ||||
-rw-r--r-- | x86/Android.bp | 78 | ||||
-rw-r--r-- | x86_64/Android.bp | 78 |
5 files changed, 344 insertions, 273 deletions
diff --git a/arm/Android.bp b/arm/Android.bp index de519d4..30bbb81 100644 --- a/arm/Android.bp +++ b/arm/Android.bp @@ -6878,7 +6878,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libaudioroute.so-notice", + licenses: ["vndk-v30-libaudioroute.so-license"], arch: { arm: { srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libaudioroute.so"], @@ -6988,7 +6988,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libcap.so-notice", + licenses: ["vndk-v30-libcap.so-license"], arch: { arm: { export_include_dirs: [ @@ -7109,7 +7109,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libcrypto.so-notice", + licenses: ["vndk-v30-libcrypto.so-license"], arch: { arm: { export_include_dirs: [ @@ -7149,7 +7149,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libcurl.so-notice", + licenses: ["vndk-v30-libcurl.so-license"], arch: { arm: { export_include_dirs: [ @@ -7211,7 +7211,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libevent.so-notice", + licenses: ["vndk-v30-libevent.so-license"], arch: { arm: { export_include_dirs: [ @@ -7232,7 +7232,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libexif.so-notice", + licenses: ["vndk-v30-libexif.so-license"], arch: { arm: { export_include_dirs: [ @@ -7252,7 +7252,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libexpat.so-notice", + licenses: ["vndk-v30-libexpat.so-license"], arch: { arm: { export_include_dirs: [ @@ -7384,7 +7384,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libhardware_legacy.so-notice", + licenses: ["vndk-v30-libhardware_legacy.so-license"], arch: { arm: { export_include_dirs: [ @@ -7444,7 +7444,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libjpeg.so-notice", + licenses: ["vndk-v30-libjpeg.so-license"], arch: { arm: { export_include_dirs: [ @@ -7465,7 +7465,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libldacBT_abr.so-notice", + licenses: ["vndk-v30-libldacBT_abr.so-license"], arch: { arm: { export_include_dirs: [ @@ -7485,7 +7485,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libldacBT_enc.so-notice", + licenses: ["vndk-v30-libldacBT_enc.so-license"], arch: { arm: { export_include_dirs: [ @@ -7505,7 +7505,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-liblz4.so-notice", + licenses: ["vndk-v30-liblz4.so-license"], arch: { arm: { export_include_dirs: [ @@ -7545,7 +7545,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libmedia_omx.so-notice", + licenses: ["vndk-v30-libmedia_omx.so-license"], arch: { arm: { export_include_dirs: [ @@ -7630,7 +7630,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libminijail.so-notice", + licenses: ["vndk-v30-libminijail.so-license"], arch: { arm: { export_include_dirs: [ @@ -7669,7 +7669,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libnetutils.so-notice", + licenses: ["vndk-v30-libnetutils.so-license"], arch: { arm: { export_include_dirs: [ @@ -7689,7 +7689,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libnl.so-notice", + licenses: ["vndk-v30-libnl.so-license"], arch: { arm: { export_include_dirs: [ @@ -7710,7 +7710,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpcre2.so-notice", + licenses: ["vndk-v30-libpcre2.so-license"], arch: { arm: { export_include_dirs: [ @@ -7731,7 +7731,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpiex.so-notice", + licenses: ["vndk-v30-libpiex.so-license"], arch: { arm: { export_include_dirs: [ @@ -7752,7 +7752,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpng.so-notice", + licenses: ["vndk-v30-libpng.so-license"], arch: { arm: { export_include_dirs: [ @@ -7773,7 +7773,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpower.so-notice", + licenses: ["vndk-v30-libpower.so-license"], arch: { arm: { export_include_dirs: [ @@ -7834,7 +7834,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libspeexresampler.so-notice", + licenses: ["vndk-v30-libspeexresampler.so-license"], arch: { arm: { export_include_dirs: [ @@ -7854,7 +7854,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libsqlite.so-notice", + licenses: ["vndk-v30-libsqlite.so-license"], arch: { arm: { export_include_dirs: [ @@ -7875,7 +7875,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libssl.so-notice", + licenses: ["vndk-v30-libssl.so-license"], arch: { arm: { export_include_dirs: [ @@ -7982,7 +7982,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libstagefright_foundation.so-notice", + licenses: ["vndk-v30-libstagefright_foundation.so-license"], arch: { arm: { export_include_dirs: [ @@ -8011,7 +8011,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libstagefright_omx.so-notice", + licenses: ["vndk-v30-libstagefright_omx.so-license"], arch: { arm: { export_include_dirs: [ @@ -8042,7 +8042,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libstagefright_omx_utils.so-notice", + licenses: ["vndk-v30-libstagefright_omx_utils.so-license"], arch: { arm: { export_include_dirs: [ @@ -8148,7 +8148,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libtinyalsa.so-notice", + licenses: ["vndk-v30-libtinyalsa.so-license"], arch: { arm: { export_include_dirs: [ @@ -8169,7 +8169,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libtinyxml2.so-notice", + licenses: ["vndk-v30-libtinyxml2.so-license"], arch: { arm: { export_include_dirs: [ @@ -8190,7 +8190,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libui.so-notice", + licenses: ["vndk-v30-libui.so-license"], arch: { arm: { export_include_dirs: [ @@ -8284,7 +8284,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libxml2.so-notice", + licenses: ["vndk-v30-libxml2.so-license"], arch: { arm: { export_include_dirs: [ @@ -8934,7 +8934,7 @@ vndk_prebuilt_shared { support_system_process: true, private: true, }, - notice: ":vndk-v30-libblas.so-notice", + licenses: ["vndk-v30-libblas.so-license"], arch: { arm: { export_include_dirs: [ @@ -8955,7 +8955,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libc++.so-notice", + licenses: ["vndk-v30-libc++.so-license"], arch: { arm: { export_include_dirs: [ @@ -8978,7 +8978,7 @@ vndk_prebuilt_shared { support_system_process: true, private: true, }, - notice: ":vndk-v30-libcompiler_rt.so-notice", + licenses: ["vndk-v30-libcompiler_rt.so-license"], arch: { arm: { srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libcompiler_rt.so"], @@ -8996,7 +8996,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libcutils.so-notice", + licenses: ["vndk-v30-libcutils.so-license"], arch: { arm: { export_include_dirs: [ @@ -9064,7 +9064,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libhardware.so-notice", + licenses: ["vndk-v30-libhardware.so-license"], arch: { arm: { export_include_dirs: [ @@ -9089,7 +9089,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libhidlbase.so-notice", + licenses: ["vndk-v30-libhidlbase.so-license"], arch: { arm: { export_include_dirs: [ @@ -9273,7 +9273,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libutils.so-notice", + licenses: ["vndk-v30-libutils.so-license"], arch: { arm: { export_include_dirs: [ @@ -9299,7 +9299,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libutilscallstack.so-notice", + licenses: ["vndk-v30-libutilscallstack.so-license"], arch: { arm: { export_include_dirs: [ @@ -9325,7 +9325,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libz.so-notice", + licenses: ["vndk-v30-libz.so-license"], arch: { arm: { export_include_dirs: [ diff --git a/arm64/Android.bp b/arm64/Android.bp index fe90427..1a63d13 100644 --- a/arm64/Android.bp +++ b/arm64/Android.bp @@ -11246,7 +11246,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libaudioroute.so-notice", + licenses: ["vndk-v30-libaudioroute.so-license"], arch: { arm: { srcs: ["arch-arm-armv8-a/shared/vndk-core/libaudioroute.so"], @@ -11400,7 +11400,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libcap.so-notice", + licenses: ["vndk-v30-libcap.so-license"], arch: { arm: { export_include_dirs: [ @@ -11602,7 +11602,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libcrypto.so-notice", + licenses: ["vndk-v30-libcrypto.so-license"], arch: { arm: { export_include_dirs: [ @@ -11655,7 +11655,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libcurl.so-notice", + licenses: ["vndk-v30-libcurl.so-license"], arch: { arm: { export_include_dirs: [ @@ -11739,7 +11739,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libevent.so-notice", + licenses: ["vndk-v30-libevent.so-license"], arch: { arm: { export_include_dirs: [ @@ -11767,7 +11767,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libexif.so-notice", + licenses: ["vndk-v30-libexif.so-license"], arch: { arm: { export_include_dirs: [ @@ -11793,7 +11793,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libexpat.so-notice", + licenses: ["vndk-v30-libexpat.so-license"], arch: { arm: { export_include_dirs: [ @@ -12003,7 +12003,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libhardware_legacy.so-notice", + licenses: ["vndk-v30-libhardware_legacy.so-license"], arch: { arm: { export_include_dirs: [ @@ -12096,7 +12096,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libjpeg.so-notice", + licenses: ["vndk-v30-libjpeg.so-license"], arch: { arm: { export_include_dirs: [ @@ -12124,7 +12124,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libldacBT_abr.so-notice", + licenses: ["vndk-v30-libldacBT_abr.so-license"], arch: { arm: { export_include_dirs: [ @@ -12150,7 +12150,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libldacBT_enc.so-notice", + licenses: ["vndk-v30-libldacBT_enc.so-license"], arch: { arm: { export_include_dirs: [ @@ -12176,7 +12176,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-liblz4.so-notice", + licenses: ["vndk-v30-liblz4.so-license"], arch: { arm: { export_include_dirs: [ @@ -12229,7 +12229,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libmedia_omx.so-notice", + licenses: ["vndk-v30-libmedia_omx.so-license"], arch: { arm: { export_include_dirs: [ @@ -12372,7 +12372,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libminijail.so-notice", + licenses: ["vndk-v30-libminijail.so-license"], arch: { arm: { export_include_dirs: [ @@ -12423,7 +12423,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libnetutils.so-notice", + licenses: ["vndk-v30-libnetutils.so-license"], arch: { arm: { export_include_dirs: [ @@ -12449,7 +12449,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libnl.so-notice", + licenses: ["vndk-v30-libnl.so-license"], arch: { arm: { export_include_dirs: [ @@ -12477,7 +12477,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpcre2.so-notice", + licenses: ["vndk-v30-libpcre2.so-license"], arch: { arm: { export_include_dirs: [ @@ -12505,7 +12505,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpiex.so-notice", + licenses: ["vndk-v30-libpiex.so-license"], arch: { arm: { export_include_dirs: [ @@ -12533,7 +12533,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpng.so-notice", + licenses: ["vndk-v30-libpng.so-license"], arch: { arm: { export_include_dirs: [ @@ -12561,7 +12561,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpower.so-notice", + licenses: ["vndk-v30-libpower.so-license"], arch: { arm: { export_include_dirs: [ @@ -12643,7 +12643,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libspeexresampler.so-notice", + licenses: ["vndk-v30-libspeexresampler.so-license"], arch: { arm: { export_include_dirs: [ @@ -12669,7 +12669,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libsqlite.so-notice", + licenses: ["vndk-v30-libsqlite.so-license"], arch: { arm: { export_include_dirs: [ @@ -12697,7 +12697,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libssl.so-notice", + licenses: ["vndk-v30-libssl.so-license"], arch: { arm: { export_include_dirs: [ @@ -12871,7 +12871,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libstagefright_foundation.so-notice", + licenses: ["vndk-v30-libstagefright_foundation.so-license"], arch: { arm: { export_include_dirs: [ @@ -12915,7 +12915,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libstagefright_omx.so-notice", + licenses: ["vndk-v30-libstagefright_omx.so-license"], arch: { arm: { export_include_dirs: [ @@ -12963,7 +12963,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libstagefright_omx_utils.so-notice", + licenses: ["vndk-v30-libstagefright_omx_utils.so-license"], arch: { arm: { export_include_dirs: [ @@ -13135,7 +13135,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libtinyalsa.so-notice", + licenses: ["vndk-v30-libtinyalsa.so-license"], arch: { arm: { export_include_dirs: [ @@ -13163,7 +13163,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libtinyxml2.so-notice", + licenses: ["vndk-v30-libtinyxml2.so-license"], arch: { arm: { export_include_dirs: [ @@ -13191,7 +13191,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libui.so-notice", + licenses: ["vndk-v30-libui.so-license"], arch: { arm: { export_include_dirs: [ @@ -13339,7 +13339,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libxml2.so-notice", + licenses: ["vndk-v30-libxml2.so-license"], arch: { arm: { export_include_dirs: [ @@ -14316,7 +14316,7 @@ vndk_prebuilt_shared { support_system_process: true, private: true, }, - notice: ":vndk-v30-libblas.so-notice", + licenses: ["vndk-v30-libblas.so-license"], arch: { arm: { export_include_dirs: [ @@ -14343,7 +14343,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libc++.so-notice", + licenses: ["vndk-v30-libc++.so-license"], arch: { arm: { export_include_dirs: [ @@ -14373,7 +14373,7 @@ vndk_prebuilt_shared { support_system_process: true, private: true, }, - notice: ":vndk-v30-libcompiler_rt.so-notice", + licenses: ["vndk-v30-libcompiler_rt.so-license"], arch: { arm: { srcs: ["arch-arm-armv8-a/shared/vndk-sp/libcompiler_rt.so"], @@ -14394,7 +14394,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libcutils.so-notice", + licenses: ["vndk-v30-libcutils.so-license"], arch: { arm: { export_include_dirs: [ @@ -14501,7 +14501,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libhardware.so-notice", + licenses: ["vndk-v30-libhardware.so-license"], arch: { arm: { export_include_dirs: [ @@ -14536,7 +14536,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libhidlbase.so-notice", + licenses: ["vndk-v30-libhidlbase.so-license"], arch: { arm: { export_include_dirs: [ @@ -14805,7 +14805,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libutils.so-notice", + licenses: ["vndk-v30-libutils.so-license"], arch: { arm: { export_include_dirs: [ @@ -14842,7 +14842,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libutilscallstack.so-notice", + licenses: ["vndk-v30-libutilscallstack.so-license"], arch: { arm: { export_include_dirs: [ @@ -14879,7 +14879,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libz.so-notice", + licenses: ["vndk-v30-libz.so-license"], arch: { arm: { export_include_dirs: [ diff --git a/common/Android.bp b/common/Android.bp index 3f8b2a2..6b9c0cb 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -5,197 +5,268 @@ package { default_applicable_licenses: ["prebuilts_vndk_v30_license"], } -filegroup { - name: "vndk-v30-libaudioroute.so-notice", - srcs: ["NOTICE_FILES/libaudioroute.so.txt"], +license { + name: "vndk-v30-libaudioroute.so-license", + license_kinds: ["SPDX-license-identifier-BSD"], + license_text: ["NOTICE_FILES/libaudioroute.so.txt"], } -filegroup { - name: "vndk-v30-libblas.so-notice", - srcs: ["NOTICE_FILES/libblas.so.txt"], +license { + name: "vndk-v30-libblas.so-license", + license_kinds: ["legacy_notice"], + license_text: ["NOTICE_FILES/libblas.so.txt"], } -filegroup { - name: "vndk-v30-libc++.so-notice", - srcs: ["NOTICE_FILES/libc++.so.txt"], +license { + name: "vndk-v30-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-v30-libcap.so-notice", - srcs: ["NOTICE_FILES/libcap.so.txt"], +license { + name: "vndk-v30-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-v30-libcompiler_rt.so-notice", - srcs: ["NOTICE_FILES/libcompiler_rt.so.txt"], +license { + name: "vndk-v30-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-v30-libcrypto.so-notice", - srcs: ["NOTICE_FILES/libcrypto.so.txt"], +license { + name: "vndk-v30-libcrypto.so-license", + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-ISC", + "SPDX-license-identifier-OpenSSL", + ], + license_text: ["NOTICE_FILES/libcrypto.so.txt"], } -filegroup { - name: "vndk-v30-libcurl.so-notice", - srcs: ["NOTICE_FILES/libcurl.so.txt"], +license { + name: "vndk-v30-libcurl.so-license", + license_kinds: ["SPDX-license-identifier-MIT"], + license_text: ["NOTICE_FILES/libcurl.so.txt"], } -filegroup { - name: "vndk-v30-libcutils.so-notice", - srcs: ["NOTICE_FILES/libcutils.so.txt"], +license { + name: "vndk-v30-libcutils.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["NOTICE_FILES/libcutils.so.txt"], } -filegroup { - name: "vndk-v30-libevent.so-notice", - srcs: ["NOTICE_FILES/libevent.so.txt"], +license { + name: "vndk-v30-libevent.so-license", + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-MIT", + "SPDX-license-identifier-NCSA", + ], + license_text: ["NOTICE_FILES/libevent.so.txt"], } -filegroup { - name: "vndk-v30-libexif.so-notice", - srcs: ["NOTICE_FILES/libexif.so.txt"], +license { + name: "vndk-v30-libexif.so-license", + license_kinds: ["SPDX-license-identifier-LGPL-2.1"], + license_text: ["NOTICE_FILES/libexif.so.txt"], } -filegroup { - name: "vndk-v30-libexpat.so-notice", - srcs: ["NOTICE_FILES/libexpat.so.txt"], +license { + name: "vndk-v30-libexpat.so-license", + license_kinds: ["SPDX-license-identifier-MIT"], + license_text: ["NOTICE_FILES/libexpat.so.txt"], } -filegroup { - name: "vndk-v30-libhardware.so-notice", - srcs: ["NOTICE_FILES/libhardware.so.txt"], +license { + name: "vndk-v30-libhardware.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["NOTICE_FILES/libhardware.so.txt"], } -filegroup { - name: "vndk-v30-libhardware_legacy.so-notice", - srcs: ["NOTICE_FILES/libhardware_legacy.so.txt"], +license { + name: "vndk-v30-libhardware_legacy.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["NOTICE_FILES/libhardware_legacy.so.txt"], } -filegroup { - name: "vndk-v30-libhidlbase.so-notice", - srcs: ["NOTICE_FILES/libhidlbase.so.txt"], +license { + name: "vndk-v30-libhidlbase.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["NOTICE_FILES/libhidlbase.so.txt"], } -filegroup { - name: "vndk-v30-libjpeg.so-notice", - srcs: ["NOTICE_FILES/libjpeg.so.txt"], +license { + name: "vndk-v30-libjpeg.so-license", + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-Zlib", + ], + license_text: ["NOTICE_FILES/libjpeg.so.txt"], } -filegroup { - name: "vndk-v30-libldacBT_abr.so-notice", - srcs: ["NOTICE_FILES/libldacBT_abr.so.txt"], +license { + name: "vndk-v30-libldacBT_abr.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: [ + "NOTICE_FILES/libldacBT_abr.so.txt", + ":Apache-2.0-License-Text", + ], } -filegroup { - name: "vndk-v30-libldacBT_enc.so-notice", - srcs: ["NOTICE_FILES/libldacBT_enc.so.txt"], +license { + name: "vndk-v30-libldacBT_enc.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: [ + "NOTICE_FILES/libldacBT_enc.so.txt", + ":Apache-2.0-License-Text", + ], } -filegroup { - name: "vndk-v30-liblz4.so-notice", - srcs: ["NOTICE_FILES/liblz4.so.txt"], +license { + name: "vndk-v30-liblz4.so-license", + license_kinds: ["SPDX-license-identifier-BSD"], + license_text: ["NOTICE_FILES/liblz4.so.txt"], } -filegroup { - name: "vndk-v30-libmedia_omx.so-notice", - srcs: ["NOTICE_FILES/libmedia_omx.so.txt"], +license { + name: "vndk-v30-libmedia_omx.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["NOTICE_FILES/libmedia_omx.so.txt"], } -filegroup { - name: "vndk-v30-libminijail.so-notice", - srcs: ["NOTICE_FILES/libminijail.so.txt"], +license { + name: "vndk-v30-libminijail.so-license", + license_kinds: ["SPDX-license-identifier-BSD"], + license_text: ["NOTICE_FILES/libminijail.so.txt"], } -filegroup { - name: "vndk-v30-libnetutils.so-notice", - srcs: ["NOTICE_FILES/libnetutils.so.txt"], +license { + name: "vndk-v30-libnetutils.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["NOTICE_FILES/libnetutils.so.txt"], } -filegroup { - name: "vndk-v30-libnl.so-notice", - srcs: ["NOTICE_FILES/libnl.so.txt"], +license { + name: "vndk-v30-libnl.so-license", + license_kinds: ["SPDX-license-identifier-LGPL-2.1"], + license_text: ["NOTICE_FILES/libnl.so.txt"], } -filegroup { - name: "vndk-v30-libpcre2.so-notice", - srcs: ["NOTICE_FILES/libpcre2.so.txt"], +license { + name: "vndk-v30-libpcre2.so-license", + license_kinds: ["SPDX-license-identifier-BSD"], + license_text: ["NOTICE_FILES/libpcre2.so.txt"], } -filegroup { - name: "vndk-v30-libpiex.so-notice", - srcs: ["NOTICE_FILES/libpiex.so.txt"], +license { + name: "vndk-v30-libpiex.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["NOTICE_FILES/libpiex.so.txt"], } -filegroup { - name: "vndk-v30-libpng.so-notice", - srcs: ["NOTICE_FILES/libpng.so.txt"], +license { + name: "vndk-v30-libpng.so-license", + license_kinds: ["legacy_notice"], + license_text: ["NOTICE_FILES/libpng.so.txt"], } -filegroup { - name: "vndk-v30-libpower.so-notice", - srcs: ["NOTICE_FILES/libpower.so.txt"], +license { + name: "vndk-v30-libpower.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["NOTICE_FILES/libpower.so.txt"], } -filegroup { - name: "vndk-v30-libspeexresampler.so-notice", - srcs: ["NOTICE_FILES/libspeexresampler.so.txt"], +license { + name: "vndk-v30-libspeexresampler.so-license", + license_kinds: ["SPDX-license-identifier-BSD"], + license_text: ["NOTICE_FILES/libspeexresampler.so.txt"], } -filegroup { - name: "vndk-v30-libsqlite.so-notice", - srcs: ["NOTICE_FILES/libsqlite.so.txt"], +license { + name: "vndk-v30-libsqlite.so-license", + license_kinds: ["legacy_permissive"], + license_text: ["NOTICE_FILES/libsqlite.so.txt"], } -filegroup { - name: "vndk-v30-libssl.so-notice", - srcs: ["NOTICE_FILES/libssl.so.txt"], +license { + name: "vndk-v30-libssl.so-license", + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-ISC", + "SPDX-license-identifier-OpenSSL", + ], + license_text: ["NOTICE_FILES/libssl.so.txt"], } -filegroup { - name: "vndk-v30-libstagefright_foundation.so-notice", - srcs: ["NOTICE_FILES/libstagefright_foundation.so.txt"], +license { + name: "vndk-v30-libstagefright_foundation.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["NOTICE_FILES/libstagefright_foundation.so.txt"], } -filegroup { - name: "vndk-v30-libstagefright_omx.so-notice", - srcs: ["NOTICE_FILES/libstagefright_omx.so.txt"], +license { + name: "vndk-v30-libstagefright_omx.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["NOTICE_FILES/libstagefright_omx.so.txt"], } -filegroup { - name: "vndk-v30-libstagefright_omx_utils.so-notice", - srcs: ["NOTICE_FILES/libstagefright_omx_utils.so.txt"], +license { + name: "vndk-v30-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-v30-libtinyalsa.so-notice", - srcs: ["NOTICE_FILES/libtinyalsa.so.txt"], +license { + name: "vndk-v30-libtinyalsa.so-license", + license_kinds: ["SPDX-license-identifier-BSD"], + license_text: ["NOTICE_FILES/libtinyalsa.so.txt"], } -filegroup { - name: "vndk-v30-libtinyxml2.so-notice", - srcs: ["NOTICE_FILES/libtinyxml2.so.txt"], +license { + name: "vndk-v30-libtinyxml2.so-license", + license_kinds: ["SPDX-license-identifier-Zlib"], + license_text: ["NOTICE_FILES/libtinyxml2.so.txt"], } -filegroup { - name: "vndk-v30-libui.so-notice", - srcs: ["NOTICE_FILES/libui.so.txt"], +license { + name: "vndk-v30-libui.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["NOTICE_FILES/libui.so.txt"], } -filegroup { - name: "vndk-v30-libutils.so-notice", - srcs: ["NOTICE_FILES/libutils.so.txt"], +license { + name: "vndk-v30-libutils.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["NOTICE_FILES/libutils.so.txt"], } -filegroup { - name: "vndk-v30-libutilscallstack.so-notice", - srcs: ["NOTICE_FILES/libutilscallstack.so.txt"], +license { + name: "vndk-v30-libutilscallstack.so-license", + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["NOTICE_FILES/libutilscallstack.so.txt"], } -filegroup { - name: "vndk-v30-libxml2.so-notice", - srcs: ["NOTICE_FILES/libxml2.so.txt"], +license { + name: "vndk-v30-libxml2.so-license", + license_kinds: ["SPDX-license-identifier-MIT"], + license_text: ["NOTICE_FILES/libxml2.so.txt"], } -filegroup { - name: "vndk-v30-libz.so-notice", - srcs: ["NOTICE_FILES/libz.so.txt"], +license { + name: "vndk-v30-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 315c2ec..3f52cab 100644 --- a/x86/Android.bp +++ b/x86/Android.bp @@ -6878,7 +6878,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libaudioroute.so-notice", + licenses: ["vndk-v30-libaudioroute.so-license"], arch: { x86: { srcs: ["arch-x86/shared/vndk-core/libaudioroute.so"], @@ -6988,7 +6988,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libcap.so-notice", + licenses: ["vndk-v30-libcap.so-license"], arch: { x86: { export_include_dirs: [ @@ -7109,7 +7109,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libcrypto.so-notice", + licenses: ["vndk-v30-libcrypto.so-license"], arch: { x86: { export_include_dirs: [ @@ -7149,7 +7149,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libcurl.so-notice", + licenses: ["vndk-v30-libcurl.so-license"], arch: { x86: { export_include_dirs: [ @@ -7211,7 +7211,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libevent.so-notice", + licenses: ["vndk-v30-libevent.so-license"], arch: { x86: { export_include_dirs: [ @@ -7232,7 +7232,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libexif.so-notice", + licenses: ["vndk-v30-libexif.so-license"], arch: { x86: { export_include_dirs: [ @@ -7252,7 +7252,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libexpat.so-notice", + licenses: ["vndk-v30-libexpat.so-license"], arch: { x86: { export_include_dirs: [ @@ -7384,7 +7384,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libhardware_legacy.so-notice", + licenses: ["vndk-v30-libhardware_legacy.so-license"], arch: { x86: { export_include_dirs: [ @@ -7444,7 +7444,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libjpeg.so-notice", + licenses: ["vndk-v30-libjpeg.so-license"], arch: { x86: { export_include_dirs: [ @@ -7465,7 +7465,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libldacBT_abr.so-notice", + licenses: ["vndk-v30-libldacBT_abr.so-license"], arch: { x86: { export_include_dirs: [ @@ -7485,7 +7485,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libldacBT_enc.so-notice", + licenses: ["vndk-v30-libldacBT_enc.so-license"], arch: { x86: { export_include_dirs: [ @@ -7505,7 +7505,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-liblz4.so-notice", + licenses: ["vndk-v30-liblz4.so-license"], arch: { x86: { export_include_dirs: [ @@ -7545,7 +7545,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libmedia_omx.so-notice", + licenses: ["vndk-v30-libmedia_omx.so-license"], arch: { x86: { export_include_dirs: [ @@ -7630,7 +7630,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libminijail.so-notice", + licenses: ["vndk-v30-libminijail.so-license"], arch: { x86: { export_include_dirs: [ @@ -7669,7 +7669,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libnetutils.so-notice", + licenses: ["vndk-v30-libnetutils.so-license"], arch: { x86: { export_include_dirs: [ @@ -7689,7 +7689,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libnl.so-notice", + licenses: ["vndk-v30-libnl.so-license"], arch: { x86: { export_include_dirs: [ @@ -7710,7 +7710,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpcre2.so-notice", + licenses: ["vndk-v30-libpcre2.so-license"], arch: { x86: { export_include_dirs: [ @@ -7731,7 +7731,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpiex.so-notice", + licenses: ["vndk-v30-libpiex.so-license"], arch: { x86: { export_include_dirs: [ @@ -7752,7 +7752,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpng.so-notice", + licenses: ["vndk-v30-libpng.so-license"], arch: { x86: { export_include_dirs: [ @@ -7773,7 +7773,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpower.so-notice", + licenses: ["vndk-v30-libpower.so-license"], arch: { x86: { export_include_dirs: [ @@ -7834,7 +7834,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libspeexresampler.so-notice", + licenses: ["vndk-v30-libspeexresampler.so-license"], arch: { x86: { export_include_dirs: [ @@ -7854,7 +7854,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libsqlite.so-notice", + licenses: ["vndk-v30-libsqlite.so-license"], arch: { x86: { export_include_dirs: [ @@ -7875,7 +7875,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libssl.so-notice", + licenses: ["vndk-v30-libssl.so-license"], arch: { x86: { export_include_dirs: [ @@ -7982,7 +7982,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libstagefright_foundation.so-notice", + licenses: ["vndk-v30-libstagefright_foundation.so-license"], arch: { x86: { export_include_dirs: [ @@ -8011,7 +8011,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libstagefright_omx.so-notice", + licenses: ["vndk-v30-libstagefright_omx.so-license"], arch: { x86: { export_include_dirs: [ @@ -8042,7 +8042,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libstagefright_omx_utils.so-notice", + licenses: ["vndk-v30-libstagefright_omx_utils.so-license"], arch: { x86: { export_include_dirs: [ @@ -8148,7 +8148,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libtinyalsa.so-notice", + licenses: ["vndk-v30-libtinyalsa.so-license"], arch: { x86: { export_include_dirs: [ @@ -8169,7 +8169,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libtinyxml2.so-notice", + licenses: ["vndk-v30-libtinyxml2.so-license"], arch: { x86: { export_include_dirs: [ @@ -8190,7 +8190,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libui.so-notice", + licenses: ["vndk-v30-libui.so-license"], arch: { x86: { export_include_dirs: [ @@ -8284,7 +8284,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libxml2.so-notice", + licenses: ["vndk-v30-libxml2.so-license"], arch: { x86: { export_include_dirs: [ @@ -8934,7 +8934,7 @@ vndk_prebuilt_shared { support_system_process: true, private: true, }, - notice: ":vndk-v30-libblas.so-notice", + licenses: ["vndk-v30-libblas.so-license"], arch: { x86: { export_include_dirs: [ @@ -8955,7 +8955,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libc++.so-notice", + licenses: ["vndk-v30-libc++.so-license"], arch: { x86: { export_include_dirs: [ @@ -8978,7 +8978,7 @@ vndk_prebuilt_shared { support_system_process: true, private: true, }, - notice: ":vndk-v30-libcompiler_rt.so-notice", + licenses: ["vndk-v30-libcompiler_rt.so-license"], arch: { x86: { srcs: ["arch-x86/shared/vndk-sp/libcompiler_rt.so"], @@ -8996,7 +8996,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libcutils.so-notice", + licenses: ["vndk-v30-libcutils.so-license"], arch: { x86: { export_include_dirs: [ @@ -9064,7 +9064,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libhardware.so-notice", + licenses: ["vndk-v30-libhardware.so-license"], arch: { x86: { export_include_dirs: [ @@ -9089,7 +9089,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libhidlbase.so-notice", + licenses: ["vndk-v30-libhidlbase.so-license"], arch: { x86: { export_include_dirs: [ @@ -9273,7 +9273,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libutils.so-notice", + licenses: ["vndk-v30-libutils.so-license"], arch: { x86: { export_include_dirs: [ @@ -9299,7 +9299,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libutilscallstack.so-notice", + licenses: ["vndk-v30-libutilscallstack.so-license"], arch: { x86: { export_include_dirs: [ @@ -9325,7 +9325,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libz.so-notice", + licenses: ["vndk-v30-libz.so-license"], arch: { x86: { export_include_dirs: [ diff --git a/x86_64/Android.bp b/x86_64/Android.bp index 466f3ec..21f877c 100644 --- a/x86_64/Android.bp +++ b/x86_64/Android.bp @@ -11246,7 +11246,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libaudioroute.so-notice", + licenses: ["vndk-v30-libaudioroute.so-license"], arch: { x86: { srcs: ["arch-x86-x86_64/shared/vndk-core/libaudioroute.so"], @@ -11400,7 +11400,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libcap.so-notice", + licenses: ["vndk-v30-libcap.so-license"], arch: { x86: { export_include_dirs: [ @@ -11602,7 +11602,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libcrypto.so-notice", + licenses: ["vndk-v30-libcrypto.so-license"], arch: { x86: { export_include_dirs: [ @@ -11655,7 +11655,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libcurl.so-notice", + licenses: ["vndk-v30-libcurl.so-license"], arch: { x86: { export_include_dirs: [ @@ -11739,7 +11739,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libevent.so-notice", + licenses: ["vndk-v30-libevent.so-license"], arch: { x86: { export_include_dirs: [ @@ -11767,7 +11767,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libexif.so-notice", + licenses: ["vndk-v30-libexif.so-license"], arch: { x86: { export_include_dirs: [ @@ -11793,7 +11793,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libexpat.so-notice", + licenses: ["vndk-v30-libexpat.so-license"], arch: { x86: { export_include_dirs: [ @@ -12003,7 +12003,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libhardware_legacy.so-notice", + licenses: ["vndk-v30-libhardware_legacy.so-license"], arch: { x86: { export_include_dirs: [ @@ -12096,7 +12096,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libjpeg.so-notice", + licenses: ["vndk-v30-libjpeg.so-license"], arch: { x86: { export_include_dirs: [ @@ -12124,7 +12124,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libldacBT_abr.so-notice", + licenses: ["vndk-v30-libldacBT_abr.so-license"], arch: { x86: { export_include_dirs: [ @@ -12150,7 +12150,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libldacBT_enc.so-notice", + licenses: ["vndk-v30-libldacBT_enc.so-license"], arch: { x86: { export_include_dirs: [ @@ -12176,7 +12176,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-liblz4.so-notice", + licenses: ["vndk-v30-liblz4.so-license"], arch: { x86: { export_include_dirs: [ @@ -12229,7 +12229,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libmedia_omx.so-notice", + licenses: ["vndk-v30-libmedia_omx.so-license"], arch: { x86: { export_include_dirs: [ @@ -12372,7 +12372,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libminijail.so-notice", + licenses: ["vndk-v30-libminijail.so-license"], arch: { x86: { export_include_dirs: [ @@ -12423,7 +12423,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libnetutils.so-notice", + licenses: ["vndk-v30-libnetutils.so-license"], arch: { x86: { export_include_dirs: [ @@ -12449,7 +12449,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libnl.so-notice", + licenses: ["vndk-v30-libnl.so-license"], arch: { x86: { export_include_dirs: [ @@ -12477,7 +12477,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpcre2.so-notice", + licenses: ["vndk-v30-libpcre2.so-license"], arch: { x86: { export_include_dirs: [ @@ -12505,7 +12505,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpiex.so-notice", + licenses: ["vndk-v30-libpiex.so-license"], arch: { x86: { export_include_dirs: [ @@ -12533,7 +12533,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpng.so-notice", + licenses: ["vndk-v30-libpng.so-license"], arch: { x86: { export_include_dirs: [ @@ -12561,7 +12561,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libpower.so-notice", + licenses: ["vndk-v30-libpower.so-license"], arch: { x86: { export_include_dirs: [ @@ -12643,7 +12643,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libspeexresampler.so-notice", + licenses: ["vndk-v30-libspeexresampler.so-license"], arch: { x86: { export_include_dirs: [ @@ -12669,7 +12669,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libsqlite.so-notice", + licenses: ["vndk-v30-libsqlite.so-license"], arch: { x86: { export_include_dirs: [ @@ -12697,7 +12697,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libssl.so-notice", + licenses: ["vndk-v30-libssl.so-license"], arch: { x86: { export_include_dirs: [ @@ -12871,7 +12871,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libstagefright_foundation.so-notice", + licenses: ["vndk-v30-libstagefright_foundation.so-license"], arch: { x86: { export_include_dirs: [ @@ -12915,7 +12915,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libstagefright_omx.so-notice", + licenses: ["vndk-v30-libstagefright_omx.so-license"], arch: { x86: { export_include_dirs: [ @@ -12963,7 +12963,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libstagefright_omx_utils.so-notice", + licenses: ["vndk-v30-libstagefright_omx_utils.so-license"], arch: { x86: { export_include_dirs: [ @@ -13135,7 +13135,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libtinyalsa.so-notice", + licenses: ["vndk-v30-libtinyalsa.so-license"], arch: { x86: { export_include_dirs: [ @@ -13163,7 +13163,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libtinyxml2.so-notice", + licenses: ["vndk-v30-libtinyxml2.so-license"], arch: { x86: { export_include_dirs: [ @@ -13191,7 +13191,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libui.so-notice", + licenses: ["vndk-v30-libui.so-license"], arch: { x86: { export_include_dirs: [ @@ -13339,7 +13339,7 @@ vndk_prebuilt_shared { vndk: { enabled: true, }, - notice: ":vndk-v30-libxml2.so-notice", + licenses: ["vndk-v30-libxml2.so-license"], arch: { x86: { export_include_dirs: [ @@ -14316,7 +14316,7 @@ vndk_prebuilt_shared { support_system_process: true, private: true, }, - notice: ":vndk-v30-libblas.so-notice", + licenses: ["vndk-v30-libblas.so-license"], arch: { x86: { export_include_dirs: [ @@ -14343,7 +14343,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libc++.so-notice", + licenses: ["vndk-v30-libc++.so-license"], arch: { x86: { export_include_dirs: [ @@ -14373,7 +14373,7 @@ vndk_prebuilt_shared { support_system_process: true, private: true, }, - notice: ":vndk-v30-libcompiler_rt.so-notice", + licenses: ["vndk-v30-libcompiler_rt.so-license"], arch: { x86: { srcs: ["arch-x86-x86_64/shared/vndk-sp/libcompiler_rt.so"], @@ -14394,7 +14394,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libcutils.so-notice", + licenses: ["vndk-v30-libcutils.so-license"], arch: { x86: { export_include_dirs: [ @@ -14501,7 +14501,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libhardware.so-notice", + licenses: ["vndk-v30-libhardware.so-license"], arch: { x86: { export_include_dirs: [ @@ -14536,7 +14536,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libhidlbase.so-notice", + licenses: ["vndk-v30-libhidlbase.so-license"], arch: { x86: { export_include_dirs: [ @@ -14805,7 +14805,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libutils.so-notice", + licenses: ["vndk-v30-libutils.so-license"], arch: { x86: { export_include_dirs: [ @@ -14842,7 +14842,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libutilscallstack.so-notice", + licenses: ["vndk-v30-libutilscallstack.so-license"], arch: { x86: { export_include_dirs: [ @@ -14879,7 +14879,7 @@ vndk_prebuilt_shared { enabled: true, support_system_process: true, }, - notice: ":vndk-v30-libz.so-notice", + licenses: ["vndk-v30-libz.so-license"], arch: { x86: { export_include_dirs: [ |