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

Commit 3ad661e7 authored Jun 15, 2017 by Paul Duffin Committed by android-build-merger Jun 15, 2017

Fix dependencies of packages that target earlier releases am: 37e9a282

am: 68117e55

Change-Id: I9c0617b6d29afd7a00ae6ead042225489b934255

parents da4e4e8f 68117e55

packages/SettingsProvider/test/Android.mk

+3 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,9 @@ LOCAL_MODULE_TAGS := tests
		LOCAL_SRC_FILES := $(call all-subdir-java-files) \
		../src/com/android/providers/settings/SettingsState.java

		LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
		LOCAL_STATIC_JAVA_LIBRARIES := android-support-test

		LOCAL_JAVA_LIBRARIES := legacy-android-test

		LOCAL_PACKAGE_NAME := SettingsProviderTest

services/tests/servicestests/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/aidl

		LOCAL_SRC_FILES += aidl/com/android/servicestests/aidl/INetworkStateObserver.aidl

		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_JAVA_LIBRARIES := android.test.mock legacy-android-test

		LOCAL_PACKAGE_NAME := FrameworksServicesTests
		LOCAL_COMPATIBILITY_SUITE := device-tests

tests/AppLaunch/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,9 +9,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
		LOCAL_PACKAGE_NAME := AppLaunch

		LOCAL_CERTIFICATE := platform
		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_JAVA_LIBRARIES := legacy-android-test

		LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
		LOCAL_STATIC_JAVA_LIBRARIES := android-support-test

		include $(BUILD_PACKAGE)

tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,8 +24,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 := guava junit legacy-android-test
		LOCAL_JAVA_LIBRARIES := legacy-android-test
		LOCAL_STATIC_JAVA_LIBRARIES := guava junit

		LOCAL_PROGUARD_ENABLED := disabled

tests/Compatibility/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,8 @@ include $(CLEAR_VARS)
		# We only want this apk build for tests.
		LOCAL_MODULE_TAGS := tests

		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
		LOCAL_JAVA_LIBRARIES := legacy-android-test
		LOCAL_STATIC_JAVA_LIBRARIES := junit
		# Include all test java files.
		LOCAL_SRC_FILES := \
		$(call all-java-files-under, src)