commit 42ed0950dcaf1061a41f58b20ac44aa7948f59dd
author Simran Basi <sbasi@google.com> Tue Jun 27 16:51:20 2017 -0700
committer Simran Basi <sbasi@google.com> Wed Jul 05 18:02:42 2017 +0000
tree d66f050832a709bacebf34911266a22bdf41e432
parent 98fcbca0266d11ffdc37130a943984e5ba3eb28b

Add cts-tradefed and compatibility-host-util to general-tests

Hostside tests will require these jars at runtime so include them
in the tf jar runpath.

Bug: 37646468
Test: make cts-tradefed compatibility-host-util

Change-Id: I6e9772dc33f4a42db7458c164abcdaea5eae0954

common/host-side/util/Android.mk

diff --git a/common/host-side/util/Android.mk b/common/host-side/util/Android.mk
index 23626bd..77a5b5d 100644
--- a/common/host-side/util/Android.mk
+++ b/common/host-side/util/Android.mk
@@ -20,6 +20,8 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := compatibility-common-util-hostsidelib jsonlib
 
+LOCAL_COMPATIBILITY_SUITE := general-tests
+
 LOCAL_JAVA_LIBRARIES := json-prebuilt tradefed
 
 LOCAL_MODULE := compatibility-host-util

tools/cts-tradefed/Android.mk

diff --git a/tools/cts-tradefed/Android.mk b/tools/cts-tradefed/Android.mk
index 179cd0a..a539e5b 100644
--- a/tools/cts-tradefed/Android.mk
+++ b/tools/cts-tradefed/Android.mk
@@ -28,6 +28,7 @@
 LOCAL_SUITE_VERSION := 8.0_r1
 
 LOCAL_MODULE := cts-tradefed
+LOCAL_COMPATIBILITY_SUITE := general-tests
 include cts/error_prone_rules.mk
 include $(BUILD_COMPATIBILITY_SUITE)