[automerger skipped] Update VNDK snapshot v29 to build 7851162. am: be2fffe3b2 am: ba96387f7f am: 9ff35b1933 -s ours
am skip reason: Merged-In I9cd4a1b063e4456a88f16a0736f964f50e31d957 with SHA-1 967b2640b2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/vndk/v29/+/16201198
Change-Id: I4a38ba5ea66b5f17d1c5de756f37d8399ad05a58
diff --git a/Android.bp b/Android.bp
index 55d9679..9d7533d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,7 +34,6 @@
"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
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/common/Android.bp b/common/Android.bp
index 742c2ba..6fc3f66 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -17,7 +17,6 @@
// 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"],
}
