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

Commit 65b05271 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prepare for removal of legacy-test from default targets"

parents cc9224c8 1d0244a8

apct-tests/perftests/core/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -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

cmds/uiautomator/library/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -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

packages/SettingsLib/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -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

packages/SettingsLib/tests/integ/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -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