Snap for 7550844 from 74647c1999f742d33575a648a1b9be0fb8fe7dcf to mainline-conscrypt-release
Change-Id: I2460320d6900ebfd73f0a7fea5807b94e3dade79
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/suite/compatibility-host-util.jar b/filegroups/suite/compatibility-host-util.jar
old mode 100644
new mode 100755
index eeabffc..fe8594e
--- a/filegroups/suite/compatibility-host-util.jar
+++ b/filegroups/suite/compatibility-host-util.jar
Binary files differ
diff --git a/filegroups/suite/compatibility-tradefed.jar b/filegroups/suite/compatibility-tradefed.jar
old mode 100644
new mode 100755
index 64db749..ae9d928
--- a/filegroups/suite/compatibility-tradefed.jar
+++ b/filegroups/suite/compatibility-tradefed.jar
Binary files differ
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/filegroups/tradefed/TradeFedTestApp.apk b/filegroups/tradefed/TradeFedTestApp.apk
old mode 100644
new mode 100755
index 7ffdd19..16e7356
--- a/filegroups/tradefed/TradeFedTestApp.apk
+++ b/filegroups/tradefed/TradeFedTestApp.apk
Binary files differ
diff --git a/filegroups/tradefed/TradeFedUiTestApp.apk b/filegroups/tradefed/TradeFedUiTestApp.apk
old mode 100644
new mode 100755
index 85d12b9..683cdac
--- a/filegroups/tradefed/TradeFedUiTestApp.apk
+++ b/filegroups/tradefed/TradeFedUiTestApp.apk
Binary files differ
diff --git a/filegroups/tradefed/atest_tradefed.sh b/filegroups/tradefed/atest_tradefed.sh
index eb6cf53..3ee48a8 100755
--- a/filegroups/tradefed/atest_tradefed.sh
+++ b/filegroups/tradefed/atest_tradefed.sh
@@ -37,7 +37,6 @@
vts-tradefed.jar
vts10-tradefed.jar
csuite-harness.jar
- tradefed-isolation.jar
host-libprotobuf-java-full.jar
cts-dalvik-host-test-runner.jar"
for dep in $deps; do
@@ -58,6 +57,6 @@
-XX:+HeapDumpOnOutOfMemoryError \
-XX:-OmitStackTraceInFastThrow \
$TRADEFED_OPTS \
- -cp ${TF_PATH} \
+ -cp "${TF_PATH}" \
-DTF_JAR_DIR=${TF_JAR_DIR} ${java_tmp_dir_opt} \
com.android.tradefed.command.CommandRunner "$@"
diff --git a/filegroups/tradefed/loganalysis-tests.jar b/filegroups/tradefed/loganalysis-tests.jar
deleted file mode 100644
index bf40e7e..0000000
--- a/filegroups/tradefed/loganalysis-tests.jar
+++ /dev/null
Binary files differ
diff --git a/filegroups/tradefed/loganalysis.jar b/filegroups/tradefed/loganalysis.jar
old mode 100644
new mode 100755
index f222172..ab5eef1
--- a/filegroups/tradefed/loganalysis.jar
+++ b/filegroups/tradefed/loganalysis.jar
Binary files differ
diff --git a/filegroups/tradefed/tf-contrib-tests.jar b/filegroups/tradefed/tf-contrib-tests.jar
old mode 100644
new mode 100755
index 7ea8a71..024476a
--- a/filegroups/tradefed/tf-contrib-tests.jar
+++ b/filegroups/tradefed/tf-contrib-tests.jar
Binary files differ
diff --git a/filegroups/tradefed/tradefed-contrib.jar b/filegroups/tradefed/tradefed-contrib.jar
old mode 100644
new mode 100755
index b5f8f8a..2c5b14a
--- a/filegroups/tradefed/tradefed-contrib.jar
+++ b/filegroups/tradefed/tradefed-contrib.jar
Binary files differ
diff --git a/filegroups/tradefed/tradefed-isolation.jar b/filegroups/tradefed/tradefed-isolation.jar
old mode 100644
new mode 100755
index 96d630a..08637ab
--- a/filegroups/tradefed/tradefed-isolation.jar
+++ b/filegroups/tradefed/tradefed-isolation.jar
Binary files differ
diff --git a/filegroups/tradefed/tradefed-test-framework.jar b/filegroups/tradefed/tradefed-test-framework.jar
old mode 100644
new mode 100755
index 792412f..4395618
--- a/filegroups/tradefed/tradefed-test-framework.jar
+++ b/filegroups/tradefed/tradefed-test-framework.jar
Binary files differ
diff --git a/filegroups/tradefed/tradefed-tests.jar b/filegroups/tradefed/tradefed-tests.jar
old mode 100644
new mode 100755
index 5339674..a171e9f
--- a/filegroups/tradefed/tradefed-tests.jar
+++ b/filegroups/tradefed/tradefed-tests.jar
Binary files differ
diff --git a/filegroups/tradefed/tradefed.jar b/filegroups/tradefed/tradefed.jar
old mode 100644
new mode 100755
index bf27e00..e899eaa
--- a/filegroups/tradefed/tradefed.jar
+++ b/filegroups/tradefed/tradefed.jar
Binary files differ
diff --git a/filegroups/tradefed/version.txt b/filegroups/tradefed/version.txt
old mode 100644
new mode 100755
index 254b923..cb8f646
--- a/filegroups/tradefed/version.txt
+++ b/filegroups/tradefed/version.txt
@@ -1 +1 @@
-7118556
+7530939
diff --git a/test_harness/Android.bp b/test_harness/Android.bp
index f7cfa1a..c74ee77 100644
--- a/test_harness/Android.bp
+++ b/test_harness/Android.bp
@@ -17,9 +17,14 @@
// 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: [
+ ":platformprotos", // Should be first to force using protos from the branch
":tradefed-prebuilt",
":tradefed-test-framework-prebuilt",
],
@@ -35,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,
}
diff --git a/test_harness/Android.mk b/test_harness/Android.mk
index 1a3a4c5..ef7b95b 100644
--- a/test_harness/Android.mk
+++ b/test_harness/Android.mk
@@ -16,12 +16,16 @@
include $(CLEAR_VARS)
ifeq (,$(wildcard $(LOCAL_PATH)/../../core))
+.PHONY: tradefed-core
+tradefed-core: tradefed atest_tradefed.sh
.PHONY: tradefed-all
-tradefed-all: tradefed
+tradefed-all: tradefed atest_tradefed.sh
-tradefed_dist_artifacts := tradefed.jar tradefed-tests.jar tradefed-test-framework.jar loganalysis.jar loganalysis-tests.jar tradefed-contrib.jar tf-contrib-tests.jar tradefed-isolation.jar tradefed.sh tradefed_win.bat script_help.sh atest_tradefed.sh TradeFedUiTestApp.apk TradeFedTestApp.apk version.txt
+tradefed_dist_host_jars := tradefed
+tradefed_dist_artifacts := tradefed-tests.jar tradefed-test-framework.jar loganalysis.jar tradefed-contrib.jar tf-contrib-tests.jar tradefed-isolation.jar tradefed.sh tradefed_win.bat script_help.sh atest_tradefed.sh TradeFedUiTestApp.apk TradeFedTestApp.apk version.txt
-tradefed_dist_copy_pairs := $(foreach m, $(tradefed_dist_artifacts), $(LOCAL_PATH)/../filegroups/tradefed/$(m):$(m))
+tradefed_dist_copy_pairs := $(foreach m, $(tradefed_dist_host_jars), $(call intermediates-dir-for,JAVA_LIBRARIES,$(m),HOST,COMMON)/javalib.jar:$(m).jar)
+tradefed_dist_copy_pairs += $(foreach m, $(tradefed_dist_artifacts), $(LOCAL_PATH)/../filegroups/tradefed/$(m):$(m))
tradefed_dist_artifacts :=
