diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-17 16:47:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-17 16:47:51 +0000 |
| commit | fa4f264b5026d4faaa89dfa9af9e211e6b8678ea (patch) | |
| tree | 9f99e17811085cda21c49bd5ff4ee1dfb061940e | |
| parent | 2e7bd2403b9e9804eac598713fae8501dab6ae15 (diff) | |
| parent | bd478b841a819177463e9c6862453660a239e011 (diff) | |
| download | objenesis-fa4f264b5026d4faaa89dfa9af9e211e6b8678ea.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/objenesis" am: 8aa13b8c1b am: bd478b841a
Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1588631
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0d168cac4dbd9441b9a96196c0904cad3037e04
| -rw-r--r-- | Android.bp | 23 | ||||
| -rw-r--r-- | tck-android/Android.bp | 9 |
2 files changed, 32 insertions, 0 deletions
@@ -14,6 +14,29 @@ // // +package { + default_applicable_licenses: ["external_objenesis_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_objenesis_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "LICENSE.txt", + "NOTICE", + ], +} + java_library_static { name: "objenesis", host_supported: true, diff --git a/tck-android/Android.bp b/tck-android/Android.bp index 7de3742..5450758 100644 --- a/tck-android/Android.bp +++ b/tck-android/Android.bp @@ -21,6 +21,15 @@ // adb install -r ${ANDROID_PRODUCT_OUT}/data/app/ObjenesisTck/ObjenesisTck.apk // adb shell am instrument -w org.objenesis.tck.android/.TckInstrumentation +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_objenesis_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_objenesis_license"], +} + android_test { name: "ObjenesisTck", sdk_version: "current", |