diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-17 18:08:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-17 18:08:09 +0000 |
| commit | 4ef02b7ce97b8e01bb9eaf7aebdd3dc5d5f4799a (patch) | |
| tree | 3d0569d6e9382915afc2f591f0f8531a6855acfc | |
| parent | 48d05f8c449df02ed712068c4fb67a855d38d02c (diff) | |
| parent | 7e3ec7519a909e94948ffdb5bf33ff0bc38bbe05 (diff) | |
| download | objenesis-4ef02b7ce97b8e01bb9eaf7aebdd3dc5d5f4799a.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/objenesis" am: 8aa13b8c1b am: bd478b841a am: fa4f264b50 am: 7e3ec7519a
Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1588631
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8bcedcb56f7391ce85276cf80d285708c731d006
| -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", |