Snap for 8426163 from 8703a3bf83f05149602c8aaed691a7be51a72816 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: Ia16da2151b654b40ff980f9d5c8c864c66a2d79a

3 files changed, 28 insertions, 33 deletions

diff --git a/Android.bp b/Android.bp
index 9ac1f35..7bf43dc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,34 +1,8 @@
-package {
-    default_applicable_licenses: ["external_gflags_license"],
-}
-
-// Added automatically by a large-scale-change
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
-// See: http://go/android-license-faq
-license {
-    name: "external_gflags_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-BSD",
-    ],
-    license_text: [
-        "COPYING.txt",
-        "LICENSE",
-    ],
-}
-
 cc_library {
     name: "libgflags",
     host_supported: true,
     vendor_available: true,
-    product_available: true,
     recovery_available: true,
-    ramdisk_available: true,
-    vendor_ramdisk_available: true,
     srcs: [
         "src/gflags.cc",
         "src/gflags_completions.cc",
@@ -47,10 +21,4 @@ cc_library {
     export_include_dirs: [
         "android",
     ],
-    static: {
-        apex_available: [
-            "com.android.gki.*",
-            "com.android.virt",
-        ],
-    },
 }
diff --git a/METADATA b/METADATA
index 0e91755..37eaaf0 100644
--- a/METADATA
+++ b/METADATA
@@ -10,7 +10,6 @@ third_party {
     value: "https://github.com/gflags/gflags.git"
   }
   version: "v2.2.2"
-  license_type: NOTICE
   last_upgrade_date {
     year: 2019
     month: 2
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..d15b0c2
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,28 @@
+Copyright (c) 2006, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.