LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prepare for removal of junit and android.test classes from Android API (step 1)

Browse Source 
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: I03f7836a1081acda5ed2c6e43cb24e9dc23b944c
This commit is contained in:
Paul Duffin
2017-03-01 13:21:09 +00:00
parent 4a67eaddd6
commit 3a87d4fea4
7 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/ApiDemos/tests/Android.mk
View File

@@ -6,6 +6,8 @@ LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

2
samples/BrokenKeyDerivation/tests/Android.mk
View File

@@ -5,6 +5,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
LOCAL_PACKAGE_NAME := BrokenKeyDerivationTests LOCAL_PACKAGE_NAME := BrokenKeyDerivationTests
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests

2
samples/HelloActivity/tests/Android.mk
View File

@@ -5,6 +5,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
LOCAL_PACKAGE_NAME := HelloActivityTests LOCAL_PACKAGE_NAME := HelloActivityTests
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests

2
samples/LunarLander/tests/Android.mk
View File

@@ -5,6 +5,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
LOCAL_PACKAGE_NAME := LunarLanderTests LOCAL_PACKAGE_NAME := LunarLanderTests
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests

2
samples/SkeletonApp/tests/Android.mk
View File

@@ -5,6 +5,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
LOCAL_PACKAGE_NAME := SkeletonAppTests LOCAL_PACKAGE_NAME := SkeletonAppTests
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests

2
samples/Snake/tests/Android.mk
View File

@@ -5,6 +5,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
LOCAL_PACKAGE_NAME := SnakeTests LOCAL_PACKAGE_NAME := SnakeTests
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests

2
samples/Vault/Android.mk
View File

@@ -6,6 +6,8 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
LOCAL_PROGUARD_ENABLED := disabled LOCAL_PROGUARD_ENABLED := disabled