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

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

Browse Source 
am: 68117e559a

Change-Id: I9c0617b6d29afd7a00ae6ead042225489b934255
This commit is contained in:
Paul Duffin
2017-06-15 11:13:08 +00:00
committed by android-build-merger
parent da4e4e8f91 68117e559a
commit 3ad661e7fb
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsProvider/test/Android.mk
View File

@@ -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

2
services/tests/servicestests/Android.mk
View File

@@ -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

4
tests/AppLaunch/Android.mk
View File

@@ -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)

4
tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
View File

@@ -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

4
tests/Compatibility/Android.mk
View File

@@ -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)