Snap for 8426163 from a947022e8ddbc709f0bbcd79d419030a276f9adc to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I6b00c9b75b9e871a64391e4720b3d4d0a4f1d55c

4 files changed, 6 insertions, 85 deletions

diff --git a/Android.bp b/Android.bp
index 07c96994e..72cd34066 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,47 +1,6 @@
 // We need to build this for both the device (as a shared library)
 // and the host (as a static library for tools to use).
 
-package {
-    default_applicable_licenses: ["external_libpng_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.
-//
-// large-scale-change filtered out the below license kinds as false-positives:
-//   SPDX-license-identifier-GPL
-//   SPDX-license-identifier-GPL-2.0
-//   SPDX-license-identifier-LGPL
-// See: http://go/android-license-faq
-license {
-    name: "external_libpng_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-CC0-1.0",
-        "SPDX-license-identifier-MIT",
-        "SPDX-license-identifier-W3C",
-        "SPDX-license-identifier-Zlib",
-        "legacy_notice",
-        "legacy_unencumbered",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
-
 cc_defaults {
     name: "libpng-defaults",
     exclude_srcs: [
@@ -58,14 +17,9 @@ cc_defaults {
     arch: {
         arm: {
             srcs: ["arm/*"],
-            cflags: ["-O3"],
         },
         arm64: {
             srcs: ["arm/*",],
-            cflags: ["-O3"],
-            exclude_srcs: [
-                "arm/filter_neon.S"
-            ],
         },
         x86: {
             srcs: ["intel/*"],
@@ -96,7 +50,6 @@ cc_defaults {
 cc_library {
     name: "libpng",
     vendor_available: true,
-    product_available: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
     recovery_available: true,
@@ -122,7 +75,7 @@ cc_library_static {
     cflags: ["-ftrapv"],
 
     shared_libs: ["libz"],
-    sdk_version: "minimum",
+    sdk_version: "14",
 }
 
 // For testing
@@ -139,28 +92,3 @@ cc_test {
         "libz",
     ],
 }
-
-cc_fuzz {
-    name: "libpng_read_fuzzer",
-    host_supported:true,
-
-    static_libs: [
-        "libpng",
-        "libz",
-    ],
-
-    srcs: [
-        "contrib/oss-fuzz/libpng_read_fuzzer.cc",
-    ],
-
-    dictionary: "contrib/oss-fuzz/png.dict",
-
-    corpus: ["contrib/testpngs/*.png"],
-
-    fuzz_config: {
-        cc: [
-            "scroggo@google.com",
-        ],
-        componentid: 87896,
-    },
-}
diff --git a/METADATA b/METADATA
index 812f45a43..cf383c0f6 100644
--- a/METADATA
+++ b/METADATA
@@ -5,11 +5,10 @@ third_party {
     type: GIT
     value: "https://github.com/glennrp/libpng.git"
   }
-  version: "v1.6.37"
-  license_type: NOTICE
+  version: "v1.6.34"
   last_upgrade_date {
-    year: 2019
-    month: 6
-    day: 10
+    year: 2017
+    month: 10
+    day: 6
   }
 }
diff --git a/NOTICE b/NOTICE
new file mode 120000
index 000000000..7a694c969
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1 @@
+LICENSE
\ No newline at end of file
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 10bd0ee90..000000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "presubmit": [
-    {
-      "name": "CtsGraphicsTestCases"
-    }
-  ]
-}