Snap for 7550844 from 2af0b6d00c19d1e846536aeb40a1b41c9e7cdd51 to mainline-tethering-releaseandroid-mainline-12.0.0_r95android-mainline-12.0.0_r82android-mainline-12.0.0_r66android-mainline-12.0.0_r53android-mainline-12.0.0_r38android-mainline-12.0.0_r18android-mainline-12.0.0_r125android-mainline-12.0.0_r110aml_tet_311811050android12-mainline-tethering-release

Change-Id: I49f0fda9318a419e1606a90c65b62c77ef291e9a

2 files changed, 40 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 0fd4080..4033ce5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,45 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["external_blktrace_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 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_blktrace_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-GPL",
+        "SPDX-license-identifier-GPL-2.0",
+        "SPDX-license-identifier-LGPL",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "COPYING",
+        "LICENSE",
+        "NOTICE",
+    ],
+}
+
 cc_defaults {
     name: "blktrace_defaults",
     include_dirs: [
diff --git a/METADATA b/METADATA
index 6a48f58..a3356e4 100644
--- a/METADATA
+++ b/METADATA
@@ -9,5 +9,6 @@ third_party {
     value: "http://git.kernel.dk/?p=blktrace.git;a=summary"
   }
   version: "1.0.1"
+  license_type: RESTRICTED
   last_upgrade_date { year: 2018 month: 12 day: 8 }
 }