From 8aeb59ebcd50a510d024dc082fa17b192074c63d Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 10 Jan 2017 12:08:23 +0000 Subject: Prepare for removal of legacy-test from default targets In preparation for removing junit classes from the Android API the legacy-test target will be removed from the TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. Bug: 30188076 Test: make checkbuild Change-Id: I13e88297731253420e4e5f5291d503f13a39a156 --- tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'tests/Camera2Tests') diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk b/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk index 50926a6fcb84..1f14f0324bc5 100644 --- a/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk +++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk @@ -25,13 +25,8 @@ LOCAL_PACKAGE_NAME := SmartCamera-tests LOCAL_SRC_FILES += $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner -#LOCAL_STATIC_JAVA_LIBRARIES := filterframework-test-lib -LOCAL_STATIC_JAVA_LIBRARIES += guava +LOCAL_STATIC_JAVA_LIBRARIES := guava junit legacy-android-test -#LOCAL_JAVA_LIBRARIES := filterframework-test-lib -LOCAL_STATIC_JAVA_LIBRARIES := guava - -LOCAL_STATIC_JAVA_LIBRARIES += LOCAL_PROGUARD_ENABLED := disabled LOCAL_INSTRUMENTATION_FOR := SmartCamera -- cgit v1.2.3-59-g8ed1b