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

Commit 6117fa8b authored by Paul Duffin's avatar Paul Duffin
Browse files

Switch usages of legacy-test to android.test.base 

The legacy-test library has been deprecated in favour of the
android.test.base library which is part of the SDK.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* core/tests/overlaytests/OverlayAppFiltered/Android.mk
    Removed legacy-test from LOCAL_JAVA_LIBRARIES because the source
    for module 'com.android.overlaytest.filtered_app_overlay' does not
    depend on classes from legacy-test

* core/tests/overlaytests/OverlayAppFirst/Android.mk
    Removed legacy-test from LOCAL_JAVA_LIBRARIES because the source
    for module 'com.android.overlaytest.first_app_overlay' does not
    depend on classes from legacy-test

* core/tests/overlaytests/OverlayAppSecond/Android.mk
    Removed legacy-test from LOCAL_JAVA_LIBRARIES because the source
    for module 'com.android.overlaytest.second_app_overlay' does not
    depend on classes from legacy-test

* core/tests/overlaytests/OverlayTest/Android.mk
    Replaced 'legacy-test' with 'android.test.base' in
    LOCAL_JAVA_LIBRARIES because the source for module 'OverlayTest'
    depends on classes from android.test.base

* core/tests/overlaytests/OverlayTestOverlay/Android.mk
    Removed legacy-test from LOCAL_JAVA_LIBRARIES because the source
    for module 'com.android.overlaytest.overlay' does not depend on
    classes from legacy-test

* test-mock/Android.mk
    Removed legacy-test from LOCAL_JAVA_LIBRARIES because the source
    for module 'repackaged.android.test.mock' does not depend on
    classes from legacy-test

Bug: 30188076
Test: make checkbuild
Change-Id: I729412304884cf5da88b05dbe8fbe645ad7b5b15
parent 05013b37

core/tests/overlaytests/OverlayAppFiltered/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := tests



LOCAL_JAVA_LIBRARIES += legacy-test



LOCAL_SDK_VERSION := system_current



LOCAL_PACKAGE_NAME := com.android.overlaytest.filtered_app_overlay

core/tests/overlaytests/OverlayAppFirst/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := tests



LOCAL_JAVA_LIBRARIES += legacy-test



LOCAL_SDK_VERSION := current



LOCAL_PACKAGE_NAME := com.android.overlaytest.first_app_overlay

core/tests/overlaytests/OverlayAppSecond/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := tests



LOCAL_JAVA_LIBRARIES += legacy-test



LOCAL_SDK_VERSION := current



LOCAL_PACKAGE_NAME := com.android.overlaytest.second_app_overlay

core/tests/overlaytests/OverlayTest/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ LOCAL_PACKAGE_NAME := OverlayTest 


LOCAL_DEX_PREOPT := false



LOCAL_JAVA_LIBRARIES += legacy-test

LOCAL_JAVA_LIBRARIES += android.test.base



LOCAL_MODULE_PATH := $(TARGET_OUT)/app

core/tests/overlaytests/OverlayTestOverlay/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := tests



LOCAL_JAVA_LIBRARIES += legacy-test



LOCAL_SDK_VERSION := current



LOCAL_PACKAGE_NAME := com.android.overlaytest.overlay