commit d3bba6f14fbcf8693fb094881b0e8e392f5c38f3
author Justin Yun <justinyun@google.com> Mon Sep 26 05:14:07 2022 +0000
committer Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> Mon Sep 26 05:14:07 2022 +0000
tree 4254f990e0a71c1a08e52f7424b98dcd3b44a63c
parent a7448d28ad2928dfd39c962fd1f717efe9f9775e
parent e858a53aacc3fdc5b6ced61ebcc49c8f1149d7fc

[automerge] Update VNDK snapshot v29 to build 9076754. 2p: 0d0fe4efdf 2p: e858a53aac

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/vndk/v29/+/20050784

Bug: 247921211
Change-Id: If06c5b9601625d79c4e3b44144894c5fd95f8fe8
Merged-In: Ie00098bfd6641f7626a0255b919f399adda2636b

Android.bp

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

METADATA

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
-}

common/Android.bp

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"],
 }