Snap for 7550844 from d545c7b569eefe2d12fb5966064f49cacea22669 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: I943836432bab9be1136561536b6e6d388d1e580e

6 files changed, 161 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 1772e8eb..b4c5cf5e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,43 @@
+package {
+    default_applicable_licenses: ["external_iproute2_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_iproute2_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-GPL",
+        "SPDX-license-identifier-GPL-2.0",
+        "SPDX-license-identifier-GPL-3.0",
+        "SPDX-license-identifier-LGPL",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "COPYING",
+        "NOTICE",
+    ],
+}
+
 NETNS_RUN_DIR = "/mnt/run"
 
 cc_library_headers {
diff --git a/METADATA b/METADATA
new file mode 100644
index 00000000..6d8601bb
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: RESTRICTED
+}
diff --git a/ip/Android.bp b/ip/Android.bp
index a6e533eb..25a44677 100644
--- a/ip/Android.bp
+++ b/ip/Android.bp
@@ -1,3 +1,35 @@
+package {
+    default_applicable_licenses: ["external_iproute2_ip_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.
+// See: http://go/android-license-faq
+license {
+    name: "external_iproute2_ip_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-GPL",
+        "SPDX-license-identifier-GPL-2.0",
+        "SPDX-license-identifier-LGPL",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 cc_binary {
     name: "ip",
     defaults: ["iproute2_defaults"],
@@ -82,4 +114,8 @@ cc_binary {
         "-Wl,-export-dynamic",
         "-Wl,--no-gc-sections",
     ],
+
+    sanitize: {
+        memtag_heap: true,
+    },
 }
diff --git a/lib/Android.bp b/lib/Android.bp
index 7b9f59ca..cb91127a 100644
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -1,3 +1,34 @@
+package {
+    default_applicable_licenses: ["external_iproute2_lib_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.
+// See: http://go/android-license-faq
+license {
+    name: "external_iproute2_lib_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-GPL",
+        "SPDX-license-identifier-GPL-2.0",
+        "SPDX-license-identifier-LGPL",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 cc_library_shared {
     name: "libiprouteutil",
     defaults: ["iproute2_defaults"],
diff --git a/misc/Android.bp b/misc/Android.bp
index 8e86e728..5b75c71a 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -1,3 +1,13 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_iproute2_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-GPL
+    //   SPDX-license-identifier-GPL-2.0
+    default_applicable_licenses: ["external_iproute2_license"],
+}
+
 cc_binary {
     name: "ss",
     defaults: ["iproute2_defaults"],
@@ -20,4 +30,8 @@ cc_binary {
     ],
 
     ldflags: ["-Wl,-export-dynamic"],
+
+    sanitize: {
+        memtag_heap: true,
+    },
 }
diff --git a/tc/Android.bp b/tc/Android.bp
index b2f6a1f8..3649cebb 100644
--- a/tc/Android.bp
+++ b/tc/Android.bp
@@ -1,3 +1,36 @@
+package {
+    default_applicable_licenses: ["external_iproute2_tc_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.
+// See: http://go/android-license-faq
+license {
+    name: "external_iproute2_tc_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-GPL",
+        "SPDX-license-identifier-GPL-2.0",
+        "SPDX-license-identifier-GPL-3.0",
+        "SPDX-license-identifier-LGPL",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 cc_binary {
     name: "tc",
     defaults: ["iproute2_defaults"],
@@ -86,4 +119,8 @@ cc_binary {
 
     // This is a work around for b/18403920
     ldflags: ["-Wl,--no-gc-sections"],
+
+    sanitize: {
+        memtag_heap: true,
+    },
 }