aboutsummaryrefslogtreecommitdiffstats
path: root/Android.bp
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-10-18 20:09:34 -0700
committerKimberly Kreider <kkreider@google.com>2019-12-17 22:23:23 +0000
commit4ba82c94824137acae8ed1c69db6d1c151b155ee (patch)
tree340466216de6672de0dffec7c2ec7a8dea017f54 /Android.bp
parent438f8347e87ebaad8605bfc7f2d125a503151570 (diff)
downloadbuild_soong-4ba82c94824137acae8ed1c69db6d1c151b155ee.tar.gz
build_soong-4ba82c94824137acae8ed1c69db6d1c151b155ee.tar.bz2
build_soong-4ba82c94824137acae8ed1c69db6d1c151b155ee.zip
DO NOT MERGE: Add tradefed_java_library_host
Add a module type for tradefed libraries that causes an additional copy to be installed at out/host/linux-x86/tradefed. Bug: 143908003 Exclude merging into *-plus-aosp branches, since they already include the change. Merged-In: I670345494abbad80dacab54471e635abfae3b3b3 Merged-In: I1cb25bbd5823a14f1a9428d58827677eff22ec7e Change-Id: I55bca53e02588827374896ef87d58f3f4bdc48c7 (cherry picked from commit f0f2e2cf79558569c227e8d96a784d9c0679814a) (cherry picked from commit cba45b28925b2fb3ebbd9e281a185de0d2b8b0c7)
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 2692b1be..2f5343e4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -281,6 +281,7 @@ bootstrap_go_package {
"java/support_libraries.go",
"java/system_modules.go",
"java/testing.go",
+ "java/tradefed.go",
],
testSrcs: [
"java/app_test.go",