aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-16 18:48:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-16 18:48:19 +0000
commitac899973f6edf04a889a7ff2a2a4124d5108df85 (patch)
treeeb5ca2b6219e6d8064855355eeb1570fd7390bbc
parent6769cd90090dd615c50e4b35c8f013889a8df41c (diff)
parent1c57440ef287d30fc76922fe801981fc63bc1975 (diff)
downloadlayoutlib-ac899973f6edf04a889a7ff2a2a4124d5108df85.tar.gz
[LSC] Add LOCAL_LICENSE_KINDS to frameworks/layoutlib am: 5da5284084 am: 1c57440ef2
Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/1589032 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I85ef7bffa5a957682235731afbff833bb12ca8b0
-rw-r--r--Android.bp28
-rw-r--r--bridge/Android.bp4
-rw-r--r--bridge/tests/Android.bp4
-rw-r--r--common/Android.bp4
-rw-r--r--create/Android.bp10
-rw-r--r--create/tests/Android.bp10
-rw-r--r--validator/Android.bp4
7 files changed, 64 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index b38baa2b8a..1df631641f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,6 +20,34 @@
// transform the framework jar into the temp_layoutlib jar.
//
+package {
+ default_applicable_licenses: ["frameworks_layoutlib_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: "frameworks_layoutlib_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-EPL",
+ ],
+ // large-scale-change unable to identify any license_text files
+}
+
java_genrule_host {
name: "temp_layoutlib",
tools: ["layoutlib_create"],
diff --git a/bridge/Android.bp b/bridge/Android.bp
index fa07cb8f68..e26f711625 100644
--- a/bridge/Android.bp
+++ b/bridge/Android.bp
@@ -14,6 +14,10 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
java_library_host {
name: "layoutlib",
diff --git a/bridge/tests/Android.bp b/bridge/tests/Android.bp
index 5c51c68a73..7beb94d8a8 100644
--- a/bridge/tests/Android.bp
+++ b/bridge/tests/Android.bp
@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
java_test_host {
name: "layoutlib-tests",
diff --git a/common/Android.bp b/common/Android.bp
index a256ae2f09..b33e75630f 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -14,6 +14,10 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
java_library_host {
name: "layoutlib-common",
diff --git a/create/Android.bp b/create/Android.bp
index 44179a9771..0fc219d7c0 100644
--- a/create/Android.bp
+++ b/create/Android.bp
@@ -14,6 +14,16 @@
// limitations under the License.
//
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "frameworks_layoutlib_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ // SPDX-license-identifier-EPL
+ default_applicable_licenses: ["frameworks_layoutlib_license"],
+}
+
java_binary_host {
name: "layoutlib_create",
diff --git a/create/tests/Android.bp b/create/tests/Android.bp
index c765707175..31fbe22abd 100644
--- a/create/tests/Android.bp
+++ b/create/tests/Android.bp
@@ -12,6 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "frameworks_layoutlib_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ // SPDX-license-identifier-EPL
+ default_applicable_licenses: ["frameworks_layoutlib_license"],
+}
+
java_test_host {
name: "layoutlib-create-tests",
diff --git a/validator/Android.bp b/validator/Android.bp
index 0eff99b19e..d26c7ef5f3 100644
--- a/validator/Android.bp
+++ b/validator/Android.bp
@@ -14,6 +14,10 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
java_library_host {
name: "layoutlib-validator",