Snap for 7478067 from f1b7997b0c2864f1f37988f5d4698008daf30aa7 to mainline-extservices-release

Change-Id: I9f9962b5a66bca565b24f916bb5a52ba37f292da
diff --git a/Android.bp b/Android.bp
index 7bf43dc..9ac1f35 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,34 @@
+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",
@@ -21,4 +47,10 @@
     export_include_dirs: [
         "android",
     ],
+    static: {
+        apex_available: [
+            "com.android.gki.*",
+            "com.android.virt",
+        ],
+    },
 }
diff --git a/METADATA b/METADATA
index 37eaaf0..0e91755 100644
--- a/METADATA
+++ b/METADATA
@@ -10,6 +10,7 @@
     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
deleted file mode 100644
index d15b0c2..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,28 +0,0 @@
-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.