diff options
| -rw-r--r-- | apct-tests/perftests/core/Android.mk | 3 | ||||
| -rw-r--r-- | cmds/uiautomator/library/Android.mk | 3 | ||||
| -rw-r--r-- | packages/SettingsLib/Android.mk | 4 | ||||
| -rw-r--r-- | packages/SettingsLib/tests/integ/Android.mk | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/apct-tests/perftests/core/Android.mk b/apct-tests/perftests/core/Android.mk index 3a7f945f55fd..200f92fb590c 100644 --- a/apct-tests/perftests/core/Android.mk +++ b/apct-tests/perftests/core/Android.mk @@ -8,7 +8,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ - apct-perftests-utils + apct-perftests-utils \ + legacy-android-test LOCAL_PACKAGE_NAME := CorePerfTests diff --git a/cmds/uiautomator/library/Android.mk b/cmds/uiautomator/library/Android.mk index de46b8c21259..f932388b0617 100644 --- a/cmds/uiautomator/library/Android.mk +++ b/cmds/uiautomator/library/Android.mk @@ -36,8 +36,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) # Generate the stub source files include $(CLEAR_VARS) LOCAL_SRC_FILES := $(uiautomator.core_src_files) -LOCAL_JAVA_LIBRARIES := $(uiautomator.core_java_libraries) -LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test +LOCAL_JAVA_LIBRARIES := $(uiautomator.core_java_libraries) legacy-android-test LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/core-src \ $(LOCAL_PATH)/testrunner-src diff --git a/packages/SettingsLib/Android.mk b/packages/SettingsLib/Android.mk index ad07283eb4f7..67ef40a23e4e 100644 --- a/packages/SettingsLib/Android.mk +++ b/packages/SettingsLib/Android.mk @@ -12,6 +12,8 @@ LOCAL_SHARED_ANDROID_LIBRARIES := \ android-support-v7-appcompat \ android-support-v14-preference +LOCAL_STATIC_JAVA_LIBRARY := legacy-android-test + LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_JAR_EXCLUDE_FILES := none @@ -21,4 +23,4 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) include $(BUILD_STATIC_JAVA_LIBRARY) # For the test package. -include $(call all-makefiles-under, $(LOCAL_PATH))
\ No newline at end of file +include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/packages/SettingsLib/tests/integ/Android.mk b/packages/SettingsLib/tests/integ/Android.mk index 42085225dd91..98bce0ca42b2 100644 --- a/packages/SettingsLib/tests/integ/Android.mk +++ b/packages/SettingsLib/tests/integ/Android.mk @@ -27,7 +27,8 @@ LOCAL_PACKAGE_NAME := SettingsLibTests LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ espresso-core \ - mockito-target-minus-junit4 + mockito-target-minus-junit4 \ + legacy-android-test include frameworks/base/packages/SettingsLib/common.mk |