Tradefed () am: 537827acde
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/tradefederation/prebuilts/+/16412262
Change-Id: Id3ba6973beac3d7d4613b4c6616de999f173c1f0
diff --git a/filegroups/PREBUILT b/filegroups/PREBUILT
index 3ac9aa3..635d9f7 100644
--- a/filegroups/PREBUILT
+++ b/filegroups/PREBUILT
@@ -1,7 +1,7 @@
The object in this prebuilt directory can be built from
platform/tools/tradefederation/core
platform/tools/tradefederation/contrib
- platform/test/suite
+ platform/test/suite
Files are obtained from git_master:test_suites_x86_64 tradefed.zip
See version.txt for build id.
diff --git a/filegroups/suite/Android.bp b/filegroups/suite/Android.bp
index c927ed6..fadc2d1 100644
--- a/filegroups/suite/Android.bp
+++ b/filegroups/suite/Android.bp
@@ -17,6 +17,10 @@
// This build file list of the prebuilts artifacts for test suites
// and reference them as filegroups individually
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
filegroup {
name: "compatibility-tradefed-prebuilt",
visibility: [
@@ -32,4 +36,3 @@
],
srcs: ["compatibility-host-util.jar"],
}
-
diff --git a/filegroups/tradefed/Android.bp b/filegroups/tradefed/Android.bp
index fd09f4b..f8f30a4 100644
--- a/filegroups/tradefed/Android.bp
+++ b/filegroups/tradefed/Android.bp
@@ -17,6 +17,10 @@
// This build file list of the prebuilts artifacts for test harness
// and reference them as filegroups individually
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
filegroup {
name: "tradefed-prebuilt",
visibility: [
diff --git a/test_harness/Android.bp b/test_harness/Android.bp
index 1a7b488..c74ee77 100644
--- a/test_harness/Android.bp
+++ b/test_harness/Android.bp
@@ -17,6 +17,10 @@
// This file contains all the build target that we expect tests writers
// to need to build tests.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
java_import_host {
name: "tradefed",
jars: [
@@ -36,7 +40,10 @@
java_import_host {
name: "tradefed-test-framework",
- jars: [":tradefed-test-framework-prebuilt"],
+ jars: [
+ ":platformprotos", // Should be first to force using protos from the branch
+ ":tradefed-test-framework-prebuilt"
+ ],
installable: true,
}