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

Merge "Use junit-host instead of junit" am: 7dda7e1e81

Browse Source 
am: bbb501281e

Change-Id: I4b4260849b69c2ce103b9ca2c37ec412892ccde0
This commit is contained in:
Paul Duffin
2016-11-29 10:30:07 +00:00
committed by android-build-merger
parent f9e5488bd1 bbb501281e
commit 52277efa6c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/layoutlib/create/tests/Android.mk
View File

@@ -23,7 +23,7 @@ LOCAL_JAVA_RESOURCE_DIRS := data mock_data
LOCAL_MODULE := layoutlib-create-tests
LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := layoutlib_create junit
LOCAL_JAVA_LIBRARIES := layoutlib_create junit-host
LOCAL_STATIC_JAVA_LIBRARIES := asm-5.0
include $(BUILD_HOST_JAVA_LIBRARY)

2
tools/preload2/Android.mk
View File

@@ -12,7 +12,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += perflib-prebuilt trove-prebuilt guavalib
# For JDWP access we use the framework in the JDWP tests from Apache Harmony, for
# convenience (and to not depend on internal JDK APIs).
LOCAL_STATIC_JAVA_LIBRARIES += apache-harmony-jdwp-tests-host junit
LOCAL_STATIC_JAVA_LIBRARIES += apache-harmony-jdwp-tests-host junit-host
LOCAL_MODULE:= preload2