Clean the license metadata on dependencies of module android.test.legacy
1) Moved the patched junit code in test-base and test-runner to a new directory test-junit which is under license CPL-1.0.
2) Clean the license metadata on packages in test-base, test-mock, test-runner and test-junit so packages have their license metadata precisely.
3) With this cleanup the Android.mk in test-legacy could be converted to Soong with license metadata handled properly, see b/319031379 and aosp/2900169.
Bug: 328809280
Test: CIs
Change-Id: I2a5832a97b09a5c7d064b8c2adbc0b04a325f326
diff --git a/test-runner/Android.bp b/test-runner/Android.bp
index 21e09d3..6b5be3cb 100644
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -14,29 +14,19 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
// Build the android.test.runner library
// =====================================
-package {
- // See: http://go/android-license-faq
- default_applicable_licenses: ["frameworks_base_test-runner_license"],
-}
-
-license {
- name: "frameworks_base_test-runner_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-CPL-1.0",
- ],
- license_text: [
- "src/junit/cpl-v10.html",
- ],
-}
-
java_sdk_library {
name: "android.test.runner",
- srcs: [":android-test-runner-sources"],
+ srcs: [
+ ":android-test-runner-sources",
+ ":frameworks-base-test-junit-runner",
+ ],
errorprone: {
javacflags: ["-Xep:DepAnn:ERROR"],