diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-03-01 13:21:11 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-05-08 19:35:58 +0100 |
| commit | da6765233024580f9d8ec1dc65798d73bc7c7e7c (patch) | |
| tree | b63027284b4971e3f713389689169a492c36857d | |
| parent | f59383c56ad8ec4ef0994233777d1c2a02df7d14 (diff) | |
| download | platform_testing-n-iot-preview-4.tar.gz | |
Prepare for removal of junit and android.test classes from Android API (step 1)android-o-preview-3android-n-iot-preview-4n-iot-preview-4
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.
Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.
Bug: 30188076
Test: make checkbuild
Change-Id: Ie8a5b67220b15af044c73cd8ff9a68dbb4231fe8
Merged-In: I8dc0496872febcd1a17ba2adc213a725ef9d8698
| -rw-r--r-- | tests/functional/applinktests/Android.mk | 6 | ||||
| -rw-r--r-- | tests/functional/downloadapp/Android.mk | 6 | ||||
| -rw-r--r-- | tests/functional/overviewtests/Android.mk | 7 | ||||
| -rw-r--r-- | tests/functional/permission/Android.mk | 6 | ||||
| -rw-r--r-- | tests/jank/jankmicrobenchmark/Android.mk | 6 | ||||
| -rw-r--r-- | tests/jank/sysapp_wear/Android.mk | 6 | ||||
| -rw-r--r-- | tests/jank/touch_latency_wear/Android.mk | 6 | ||||
| -rw-r--r-- | tests/jank/uibench/Android.mk | 6 | ||||
| -rw-r--r-- | tests/jank/uibench_wear/Android.mk | 6 |
9 files changed, 46 insertions, 9 deletions
diff --git a/tests/functional/applinktests/Android.mk b/tests/functional/applinktests/Android.mk index 6644ac9d2..5f7558c30 100644 --- a/tests/functional/applinktests/Android.mk +++ b/tests/functional/applinktests/Android.mk @@ -21,7 +21,11 @@ LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := launcher-helper-lib ub-uiautomator +LOCAL_STATIC_JAVA_LIBRARIES := \ + launcher-helper-lib \ + ub-uiautomator \ + legacy-android-test \ + junit LOCAL_PACKAGE_NAME := AppLinkFunctionalTests LOCAL_CERTIFICATE := platform diff --git a/tests/functional/downloadapp/Android.mk b/tests/functional/downloadapp/Android.mk index 814537b46..6c02d6f30 100644 --- a/tests/functional/downloadapp/Android.mk +++ b/tests/functional/downloadapp/Android.mk @@ -7,7 +7,11 @@ LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := launcher-helper-lib ub-uiautomator android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := \ + launcher-helper-lib \ + ub-uiautomator \ + android-support-test \ + legacy-android-test LOCAL_PACKAGE_NAME := DownloadAppFunctionalTests LOCAL_CERTIFICATE := platform diff --git a/tests/functional/overviewtests/Android.mk b/tests/functional/overviewtests/Android.mk index 6d6cec73b..13c7fd268 100644 --- a/tests/functional/overviewtests/Android.mk +++ b/tests/functional/overviewtests/Android.mk @@ -19,7 +19,12 @@ LOCAL_PACKAGE_NAME := OverviewFunctionalTests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator timeresult-helper-lib launcher-helper-lib android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := \ + ub-uiautomator \ + timeresult-helper-lib \ + launcher-helper-lib \ + android-support-test \ + legacy-android-test LOCAL_SDK_VERSION := current diff --git a/tests/functional/permission/Android.mk b/tests/functional/permission/Android.mk index 0ecdeb286..6c1546ebb 100644 --- a/tests/functional/permission/Android.mk +++ b/tests/functional/permission/Android.mk @@ -7,7 +7,11 @@ LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator launcher-helper-lib +LOCAL_STATIC_JAVA_LIBRARIES := \ + ub-uiautomator \ + launcher-helper-lib \ + legacy-android-test \ + junit LOCAL_PACKAGE_NAME := PermissionFunctionalTests LOCAL_CERTIFICATE := platform diff --git a/tests/jank/jankmicrobenchmark/Android.mk b/tests/jank/jankmicrobenchmark/Android.mk index d0be0098e..65321f2f4 100644 --- a/tests/jank/jankmicrobenchmark/Android.mk +++ b/tests/jank/jankmicrobenchmark/Android.mk @@ -19,7 +19,11 @@ LOCAL_PACKAGE_NAME := JankMicroBenchmarkTests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator ub-janktesthelper +LOCAL_STATIC_JAVA_LIBRARIES := \ + ub-uiautomator \ + ub-janktesthelper \ + legacy-android-test \ + junit LOCAL_SDK_VERSION := current diff --git a/tests/jank/sysapp_wear/Android.mk b/tests/jank/sysapp_wear/Android.mk index a8c27cdb7..9a406149f 100644 --- a/tests/jank/sysapp_wear/Android.mk +++ b/tests/jank/sysapp_wear/Android.mk @@ -19,7 +19,11 @@ LOCAL_PACKAGE_NAME := SysAppJankTestsWear LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator ub-janktesthelper +LOCAL_STATIC_JAVA_LIBRARIES := \ + ub-uiautomator \ + ub-janktesthelper \ + legacy-android-test \ + junit LOCAL_SDK_VERSION := current diff --git a/tests/jank/touch_latency_wear/Android.mk b/tests/jank/touch_latency_wear/Android.mk index 71d53fc33..bf6ea90ac 100644 --- a/tests/jank/touch_latency_wear/Android.mk +++ b/tests/jank/touch_latency_wear/Android.mk @@ -19,7 +19,11 @@ LOCAL_PACKAGE_NAME := TouchLatencyJankTestWear LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator ub-janktesthelper +LOCAL_STATIC_JAVA_LIBRARIES := \ + ub-uiautomator \ + ub-janktesthelper \ + legacy-android-test \ + junit LOCAL_SDK_VERSION := current diff --git a/tests/jank/uibench/Android.mk b/tests/jank/uibench/Android.mk index c46630b9c..ed72b4702 100644 --- a/tests/jank/uibench/Android.mk +++ b/tests/jank/uibench/Android.mk @@ -19,7 +19,11 @@ LOCAL_PACKAGE_NAME := UiBenchJankTests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator ub-janktesthelper +LOCAL_STATIC_JAVA_LIBRARIES := \ + ub-uiautomator \ + ub-janktesthelper \ + legacy-android-test \ + junit LOCAL_SDK_VERSION := current diff --git a/tests/jank/uibench_wear/Android.mk b/tests/jank/uibench_wear/Android.mk index b21a6401d..79fc23fb7 100644 --- a/tests/jank/uibench_wear/Android.mk +++ b/tests/jank/uibench_wear/Android.mk @@ -19,7 +19,11 @@ LOCAL_PACKAGE_NAME := UiBenchJankTestsWear LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator ub-janktesthelper +LOCAL_STATIC_JAVA_LIBRARIES := \ + ub-uiautomator \ + ub-janktesthelper \ + legacy-android-test \ + junit LOCAL_SDK_VERSION := current |