diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:32:11 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:32:11 +0000 |
commit | 3b917d3954688e663c564e7b32b6da40fd91e3b6 (patch) | |
tree | da8f1fbae2eb06d58dd28b4c731deb942feebe1a | |
parent | f29c4da23bc4cbe804fe8fcd043c4af360b1a9a7 (diff) | |
parent | 10c0065d72656f73f50650828a203e7c03751342 (diff) | |
download | junit-3b917d3954688e663c564e7b32b6da40fd91e3b6.tar.gz |
Snap for 7550844 from 10c0065d72656f73f50650828a203e7c03751342 to mainline-os-statsd-releaseandroid-mainline-12.0.0_r84android-mainline-12.0.0_r58android12-mainline-statsd-release
Change-Id: I003380eb2a3234eabd584c0d130dfccbb45d7a95
-rw-r--r-- | Android.bp | 28 | ||||
-rw-r--r-- | METADATA | 1 | ||||
-rw-r--r-- | OWNERS | 3 |
3 files changed, 26 insertions, 6 deletions
@@ -14,6 +14,29 @@ // // +package { + default_applicable_licenses: ["external_junit_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_junit_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-EPL", + ], + license_text: [ + "LICENSE-junit.txt", + "NOTICE.txt", + ], +} + java_library_static { name: "junit", host_supported: true, @@ -21,11 +44,6 @@ java_library_static { srcs: ["src/main/java/**/*.java"], sdk_version: "core_current", static_libs: ["hamcrest"], - - // 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", } // Legacy junit-host jar until references are updated @@ -10,6 +10,7 @@ third_party { value: "https://github.com/junit-team/junit4/archive/r4.12.tar.gz" } version: "r4.12" + license_type: RECIPROCAL last_upgrade_date { year: 2016 month: 12 @@ -1,2 +1,3 @@ paulduffin@google.com -android-libcore-team+review@google.com +jgaillard@google.com +prb@google.com |