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

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

Merge "Flatten dependency hierarchy of legacy-android-test"

parents f5854f16 2710ca1e

cmds/uiautomator/instrumentation/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES := $(call all-java-files-under, testrunner-src) \

    $(call all-java-files-under, ../library/core-src)

LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit

LOCAL_STATIC_JAVA_LIBRARIES := junit

LOCAL_MODULE := uiautomator-instrumentation

# TODO: change this to 18 when it's available

LOCAL_SDK_VERSION := current

cmds/uiautomator/library/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ uiautomator_internal_removed_api_file := \ 
include $(CLEAR_VARS)

LOCAL_SRC_FILES := $(uiautomator.core_src_files)

LOCAL_MODULE := uiautomator.core

LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test

LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base

LOCAL_STATIC_JAVA_LIBRARIES := junit

include $(BUILD_STATIC_JAVA_LIBRARY)



###############################################

core/tests/BroadcastRadioTests/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ LOCAL_MODULE_TAGS := tests 


LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test testng



LOCAL_JAVA_LIBRARIES := android.test.base



LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)

LOCAL_SRC_FILES := $(call all-java-files-under, src)

core/tests/coretests/Android.mk

+8 −1
Original line number Diff line number Diff line
@@ -45,7 +45,14 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    truth-prebuilt \

    print-test-util-lib



LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt telephony-common org.apache.http.legacy

LOCAL_JAVA_LIBRARIES := \

    android.test.runner \

    conscrypt \

    telephony-common \

    org.apache.http.legacy \

    android.test.base \

    android.test.mock \



LOCAL_PACKAGE_NAME := FrameworksCoreTests

LOCAL_COMPATIBILITY_SUITE := device-tests

core/tests/featureflagtests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ LOCAL_SRC_FILES := \ 


LOCAL_DX_FLAGS := --core-library

LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib android-support-test

LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base

LOCAL_PACKAGE_NAME := FrameworksCoreFeatureFlagTests



LOCAL_CERTIFICATE := platform