diff options
| author | 2016-11-29 10:12:51 +0000 | |
|---|---|---|
| committer | 2016-11-29 10:12:52 +0000 | |
| commit | 7dda7e1e81a638a63d1266f4cabb912a4a2cc1ec (patch) | |
| tree | 97a766446e89ccdc87bb8ab8061ed369f64718ee | |
| parent | 9309f1cbf308281be87b80cfbee7b61ba3725e78 (diff) | |
| parent | 21cf84f8b3561d61e39d77cc00c520951f1ddd0f (diff) | |
Merge "Use junit-host instead of junit"
| -rw-r--r-- | tools/layoutlib/create/tests/Android.mk | 2 | ||||
| -rw-r--r-- | tools/preload2/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/layoutlib/create/tests/Android.mk b/tools/layoutlib/create/tests/Android.mk index dafb9c6f9402..61e381d48b16 100644 --- a/tools/layoutlib/create/tests/Android.mk +++ b/tools/layoutlib/create/tests/Android.mk @@ -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) diff --git a/tools/preload2/Android.mk b/tools/preload2/Android.mk index 09d95ffe3506..769db6bd3ead 100644 --- a/tools/preload2/Android.mk +++ b/tools/preload2/Android.mk @@ -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 |