Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52277efa authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

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

am: bbb50128

Change-Id: I4b4260849b69c2ce103b9ca2c37ec412892ccde0
parents f9e5488b bbb50128

tools/layoutlib/create/tests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

tools/preload2/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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