commit e76833784c3976c7c70eca320349cc1c3326f9c3
author Rubin Xu <rubinxu@google.com> Sat Mar 06 19:26:31 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Mar 06 19:26:31 2021 +0000
tree c8553bb17dd2b358e15ff102fa3f298be913c917
parent 2ca28db194d7cb430e707acd5c019f530187562e
parent 5e0744b027d4d1250e6d205943ceacb66b78705e

[automerger skipped] Upgrade V8 to 8.8.278.14 am: 7fca112f30 -s ours am: e6b248a453 -s ours am: a3194f0def -s ours am: f6b0dd6722 -s ours am: b856655703 -s ours am: 5e0744b027 -s ours

am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 204ba1d12f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13580729

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9dbfb5471ff8ca00d36f1830124c56ff7fb036b6

Android.bp

diff --git a/Android.bp b/Android.bp
index b81a318..79708cd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,38 @@
+package {
+    default_applicable_licenses: ["external_chromium-libpac_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-2.0
+//   SPDX-license-identifier-LGPL-2.1
+// See: http://go/android-license-faq
+license {
+    name: "external_chromium-libpac_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MPL",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 cc_library_shared {
     name: "libpac",
 
@@ -35,8 +70,7 @@
         ],
     },
     apex_available: [
-        "com.android.art.release",
-        "com.android.art.debug",
+        "com.android.i18n",
     ],
     sanitize: {
         cfi: true,

METADATA

diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..5c3f89c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: RECIPROCAL
+}

NOTICE

diff --git a/NOTICE b/NOTICE
deleted file mode 120000
index 7a694c9..0000000
--- a/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE
\ No newline at end of file

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..3a76eef
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,5 @@
+{
+  "presubmit": [
+    { "name": "proxy_resolver_v8_unittest" }
+  ]
+}

test/Android.bp

diff --git a/test/Android.bp b/test/Android.bp
index 5910ebb..ba0642f 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_chromium-libpac_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-BSD
+    default_applicable_licenses: ["external_chromium-libpac_license"],
+}
+
 cc_test {
     name: "proxy_resolver_v8_unittest",
 
@@ -20,4 +29,6 @@
         "liblog",
         "libandroid_runtime",
     ],
+
+    test_suites: ["device-tests"],
 }