Update VNDK snapshot v29 to build 7851162.
Taken from branch qt-gsi-release.
Bug: 202241946
Test: na
Change-Id: I9cd4a1b063e4456a88f16a0736f964f50e31d957
diff --git a/Android.bp b/Android.bp
index 55d9679..b32eb77 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,45 +1,6 @@
// THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
// DO NOT EDIT
-package {
- default_applicable_licenses: ["prebuilts_vndk_v29_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
-license {
- name: "prebuilts_vndk_v29_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-GPL",
- "SPDX-license-identifier-GPL-2.0",
- "SPDX-license-identifier-ISC",
- "SPDX-license-identifier-LGPL",
- "SPDX-license-identifier-LGPL-2.1",
- "SPDX-license-identifier-LGPL-3.0",
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-NCSA",
- "SPDX-license-identifier-OpenSSL",
- "SPDX-license-identifier-Zlib",
- "legacy_permissive",
- ],
- // large-scale-change unable to identify any license_text files
-}
-
prebuilt_etc {
name: "llndk.libraries.29.txt",
target: {
@@ -129,3 +90,4 @@
},
},
}
+
diff --git a/METADATA b/METADATA
deleted file mode 100644
index 040120c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,7 +0,0 @@
-third_party {
- # would be NOTICE save for GPL and LGPL in:
- # common/NOTICE_FILES/libcap.so.txt
- # common/NOTICE_FILES/libnl.so.txt
- # common/NOTICE_FILES/libexif.so.txt
- license_type: RESTRICTED
-}
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..219175d
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,4 @@
[email protected]
[email protected]
[email protected]
[email protected]
diff --git a/arm/Android.bp b/arm/Android.bp
index 049c482..71f7740 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -1,16 +1,6 @@
// THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
// DO NOT EDIT
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "prebuilts_vndk_v29_license"
- // to get the below license kinds:
- // SPDX-license-identifier-BSD
- // SPDX-license-identifier-MIT
- default_applicable_licenses: ["prebuilts_vndk_v29_license"],
-}
-
vndk_prebuilt_shared {
name: "[email protected]",
version: "29",
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/[email protected] b/arm/arch-arm-armv7-a-neon/shared/vndk-core/[email protected]
index d266cee..e736118 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/[email protected]
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/[email protected]
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
index 5a86876..a3987fa 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/arm/binder32/Android.bp b/arm/binder32/Android.bp
index a19e038..a21e08a 100644
--- a/arm/binder32/Android.bp
+++ b/arm/binder32/Android.bp
@@ -1,10 +1,6 @@
// THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
// DO NOT EDIT
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
vndk_prebuilt_shared {
name: "[email protected]",
version: "29",
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/[email protected] b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/[email protected]
index d266cee..e736118 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/[email protected]
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-core/[email protected]
Binary files differ
diff --git a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
index 35a4e4f..88a217c 100755
--- a/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
+++ b/arm/binder32/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 81b6667..088a0fa 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -1,16 +1,6 @@
// THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
// DO NOT EDIT
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "prebuilts_vndk_v29_license"
- // to get the below license kinds:
- // SPDX-license-identifier-BSD
- // SPDX-license-identifier-MIT
- default_applicable_licenses: ["prebuilts_vndk_v29_license"],
-}
-
vndk_prebuilt_shared {
name: "[email protected]",
version: "29",
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/[email protected] b/arm64/arch-arm-armv8-a/shared/vndk-core/[email protected]
index ed13a95..9eb91d3 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/[email protected]
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/[email protected]
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so b/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so
index 3599ed8..38d8834 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/[email protected] b/arm64/arch-arm64-armv8-a/shared/vndk-core/[email protected]
index b49c3d5..17105c4 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/[email protected]
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/[email protected]
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so
index e01a911..4da0831 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/common/Android.bp b/common/Android.bp
index 742c2ba..5c1718b 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -1,27 +1,6 @@
// THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
// DO NOT EDIT
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "prebuilts_vndk_v29_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- // SPDX-license-identifier-BSD
- // SPDX-license-identifier-GPL
- // SPDX-license-identifier-GPL-2.0
- // SPDX-license-identifier-ISC
- // SPDX-license-identifier-LGPL
- // SPDX-license-identifier-LGPL-2.1
- // SPDX-license-identifier-LGPL-3.0
- // SPDX-license-identifier-MIT
- // SPDX-license-identifier-NCSA
- // SPDX-license-identifier-OpenSSL
- // SPDX-license-identifier-Zlib
- // legacy_permissive
- default_applicable_licenses: ["prebuilts_vndk_v29_license"],
-}
-
filegroup {
name: "vndk-v29-libaudioroute.so-notice",
srcs: ["NOTICE_FILES/libaudioroute.so.txt"],
diff --git a/x86/Android.bp b/x86/Android.bp
index 922f9f6..5f4b9ee 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -1,16 +1,6 @@
// THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
// DO NOT EDIT
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "prebuilts_vndk_v29_license"
- // to get the below license kinds:
- // SPDX-license-identifier-BSD
- // SPDX-license-identifier-MIT
- default_applicable_licenses: ["prebuilts_vndk_v29_license"],
-}
-
vndk_prebuilt_shared {
name: "[email protected]",
version: "29",
diff --git a/x86/arch-x86-x86/shared/vndk-core/[email protected] b/x86/arch-x86-x86/shared/vndk-core/[email protected]
index b6e74f4..d439220 100755
--- a/x86/arch-x86-x86/shared/vndk-core/[email protected]
+++ b/x86/arch-x86-x86/shared/vndk-core/[email protected]
Binary files differ
diff --git a/x86/arch-x86-x86/shared/vndk-sp/libhidlbase.so b/x86/arch-x86-x86/shared/vndk-sp/libhidlbase.so
index 9da772a..ba1f3cd 100755
--- a/x86/arch-x86-x86/shared/vndk-sp/libhidlbase.so
+++ b/x86/arch-x86-x86/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/x86/binder32/Android.bp b/x86/binder32/Android.bp
index 5eac1bf..94f5234 100644
--- a/x86/binder32/Android.bp
+++ b/x86/binder32/Android.bp
@@ -1,10 +1,6 @@
// THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
// DO NOT EDIT
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
vndk_prebuilt_shared {
name: "[email protected]",
version: "29",
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-core/[email protected] b/x86/binder32/arch-x86-x86/shared/vndk-core/[email protected]
index b6e74f4..d439220 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-core/[email protected]
+++ b/x86/binder32/arch-x86-x86/shared/vndk-core/[email protected]
Binary files differ
diff --git a/x86/binder32/arch-x86-x86/shared/vndk-sp/libhidlbase.so b/x86/binder32/arch-x86-x86/shared/vndk-sp/libhidlbase.so
index a7d83db..0058786 100755
--- a/x86/binder32/arch-x86-x86/shared/vndk-sp/libhidlbase.so
+++ b/x86/binder32/arch-x86-x86/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index aac96e3..b210c0f 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -1,16 +1,6 @@
// THIS FILE IS AUTOGENERATED BY development/vndk/snapshot/gen_buildfiles.py
// DO NOT EDIT
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "prebuilts_vndk_v29_license"
- // to get the below license kinds:
- // SPDX-license-identifier-BSD
- // SPDX-license-identifier-MIT
- default_applicable_licenses: ["prebuilts_vndk_v29_license"],
-}
-
vndk_prebuilt_shared {
name: "[email protected]",
version: "29",
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/[email protected] b/x86_64/arch-x86-x86_64/shared/vndk-core/[email protected]
index b0d4385..beeb6dd 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/[email protected]
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/[email protected]
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidlbase.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidlbase.so
index 1fb3c6c..97ba484 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidlbase.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-core/[email protected] b/x86_64/arch-x86_64-x86_64/shared/vndk-core/[email protected]
index 6e11476..82ee048 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-core/[email protected]
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-core/[email protected]
Binary files differ
diff --git a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libhidlbase.so b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libhidlbase.so
index 5d823f3..7893454 100755
--- a/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libhidlbase.so
+++ b/x86_64/arch-x86_64-x86_64/shared/vndk-sp/libhidlbase.so
Binary files differ
