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

Merge "Statically include android.test.runner classes in legacy-android-test" am: 9588b607f0 am: e73cd1f690

Browse Source 
am: 21a13a84d4

Change-Id: Iebc061d25e9876f5dbb3af6e2b037e78c1401906
This commit is contained in:
Paul Duffin
2017-05-10 12:12:50 +00:00
committed by android-build-merger
parent 7b96660a43 21a13a84d4
commit 4db1f8ec36
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 # Build the legacy-test library
# ============================= # =============================
# This contains the junit.framework and android.test classes that were in # 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) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -31,10 +31,13 @@ include $(BUILD_JAVA_LIBRARY)
# Build the legacy-android-test 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) 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_MODULE := legacy-android-test
LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core-oj core-libart framework junit LOCAL_JAVA_LIBRARIES := core-oj core-libart framework junit