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

Merge "Add legacy-android-test target containing android.test classes" am: c20518139a

Browse Source 
am: 78af448c30

Change-Id: I272502ca8504683f5feb4abf345a2665e99da057
This commit is contained in:
Paul Duffin
2017-01-18 11:34:39 +00:00
committed by android-build-merger
parent aa90336510 78af448c30
commit 2ac0e2a186
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
legacy-test/Android.mk
View File

@@ -18,7 +18,8 @@ LOCAL_PATH:= $(call my-dir)
# Build the legacy-test library # Build the legacy-test library
# ============================= # =============================
# This contains the junit.framework classes that were in Android API level 25. # This contains the junit.framework and android.test classes that were in
# Android API level 25.
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -28,6 +29,18 @@ LOCAL_JAVA_LIBRARIES := core-oj core-libart framework
include $(BUILD_JAVA_LIBRARY) include $(BUILD_JAVA_LIBRARY)
# Build the legacy-android-test library
# =============================
# This contains the android.test classes that were in Android API level 25.
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under, src/android)
LOCAL_MODULE := legacy-android-test
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core-oj core-libart framework junit
include $(BUILD_STATIC_JAVA_LIBRARY)
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
# Build the legacy-performance-test-hostdex library # Build the legacy-performance-test-hostdex library
# ================================================= # =================================================