diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-23 02:31:40 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-23 02:31:40 +0000 |
commit | b65776dc397cb5c8b2c6df310e0379b86afc6987 (patch) | |
tree | 3d0569d6e9382915afc2f591f0f8531a6855acfc | |
parent | 170bfdd5ca3fdbd2a3a99ce825dca3382e307bbf (diff) | |
parent | fda1552396faca7cf3a556d601be2adcf1897875 (diff) | |
download | objenesis-android12-mainline-neuralnetworks-release.tar.gz |
Snap for 7483611 from fda1552396faca7cf3a556d601be2adcf1897875 to mainline-neuralnetworks-releaseandroid-mainline-12.0.0_r92android-mainline-12.0.0_r78android-mainline-12.0.0_r50android-mainline-12.0.0_r33android-mainline-12.0.0_r3android12-mainline-neuralnetworks-release
Change-Id: I53a45479c4116db27ddd75e577024a4aedc14903
-rw-r--r-- | Android.bp | 28 | ||||
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | OWNERS | 1 | ||||
-rw-r--r-- | tck-android/Android.bp | 9 |
4 files changed, 36 insertions, 5 deletions
@@ -14,17 +14,35 @@ // // +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, hostdex: true, srcs: ["main/src/main/java/**/*.java"], sdk_version: "core_current", - - // Pin to Java language level 8. It is loaded by an OpenJDK 8 runtime from - // prebuilts/studio/jdk in frameworks/layoutlib/bridge/tests/run_tests.sh. - // See b/141970724. - java_version: "1.8", } // Compatibility library for old name of host target diff --git a/METADATA b/METADATA new file mode 100644 index 0000000..d97975c --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} @@ -1 +1,2 @@ paulduffin@google.com +jgaillard@google.com 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", |