Snap for 8564071 from a8f58b3dc7a2e80fba1075281dc94192322f5771 to mainline-art-releaseaml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050android13-mainline-art-release

Change-Id: Ic9531a7027cf285fea104bf53eaf3e0c3a7f550f

2 files changed, 10 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 3edd4b6a92..5f160560dc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,6 +48,15 @@ cc_defaults {
     ],
     host_supported: true,
     vendor_available: true,
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.bluetooth",
+    ],
+    shared_libs: [
+        "libz",
+    ],
+    stl: "libc++",
+    min_sdk_version: "30"
 }
 
 cc_library_host_static {
@@ -957,7 +966,6 @@ cc_library_static {
     ],
     whole_static_libs: [
         "libgrpc_trace",
-        "libz",
     ],
     shared_libs: [
         "liblog",
diff --git a/METADATA b/METADATA
index 240084ecf3..baa17703d0 100644
--- a/METADATA
+++ b/METADATA
@@ -1,6 +1,4 @@
 third_party {
-  # would be NOTICE save for MPL 2.0 in:
-  #   etc/roots.pem
-  #   src/android/test/interop/app/src/main/assets/roots.pem
+  license_note: "would be NOTICE save for MPL 2.0 in: etc/roots.pem and src/android/test/interop/app/src/main/assets/roots.pem"
   license_type: RECIPROCAL
 }