Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Statically include android.test.runner classes in legacy-android-test

Browse Source 
In preparation for removing junit and android.test classes from
the Android API this change adds the android.test classes that are in
the android.test.runner library into legacy-android-test so that they
can be statically included into the application.

The junit.... classes from android.test.runner can already be
statically included from the junit library.

Bug: 30188076
Test: make checkbuild
Change-Id: Id8d32da9e46f0d9142b60ef28998b40e8d237b32
This commit is contained in:
Paul Duffin
2017-05-02 13:13:13 +01:00
parent c3d41d5093
commit 4e0c19048d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
legacy-test/Android.mk
View File

@@ -19,7 +19,7 @@ LOCAL_PATH:= $(call my-dir)
# Build the legacy-test library
# =============================
# This contains the junit.framework and android.test classes that were in
# Android API level 25.
# Android API level 25 excluding those from android.test.runner.
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -31,10 +31,13 @@ include $(BUILD_JAVA_LIBRARY)
# Build the legacy-android-test library
# =============================
# This contains the android.test classes that were in Android API level 25.
# This contains the android.test classes that were in Android API level 25,
# including those from android.test.runner.
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under, src/android)
LOCAL_SRC_FILES := \
$(call all-java-files-under, src/android) \
$(call all-java-files-under, ../test-runner/src/android)
LOCAL_MODULE := legacy-android-test
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core-oj core-libart framework junit