From 242c7b5dcdcdfdb4b165c377bd34731e1fc8ccff Mon Sep 17 00:00:00 2001 From: Chandan Nath Date: Fri, 11 Jan 2019 19:58:23 +0000 Subject: [PATCH] [Roboelectric] Remove backup tests from framework target This is the sequal to ag/5779092 where we created a new target RunBackupFrameworksServicesRoboTests spcifically for backup tests. We had then kept the backup tests in the original target since we want to push out cl/228790879 first to make sure our new target was being run in presubmit. Bug: 120223382 Test: 1) atest RunFrameworksServicesRoboTests (backup + location). out: RunFrameworksServicesRoboTests: OK (33 tests) 2) atest RunBackupFrameworksServicesRoboTests (backup). out: RunBackupFrameworksServicesRoboTests: OK (586 tests) Change-Id: I2016363d95ce2f2ad1b79aa8afc3b44f973f5cfc --- services/robotests/Android.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/services/robotests/Android.mk b/services/robotests/Android.mk index 9159f0d476212..0cf0d3402dea7 100644 --- a/services/robotests/Android.mk +++ b/services/robotests/Android.mk @@ -26,9 +26,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_PRIVILEGED_MODULE := true LOCAL_STATIC_JAVA_LIBRARIES := \ - bmgrlib \ - bu \ - services.backup \ services.core \ services.net @@ -41,8 +38,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := FrameworksServicesRoboTests -LOCAL_SRC_FILES := $(call all-java-files-under, src) \ - $(call all-java-files-under, backup/src) +LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res @@ -82,8 +78,7 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_TEST_PACKAGE := FrameworksServicesLib -LOCAL_ROBOTEST_FILES := $(call find-files-in-subdirs,$(LOCAL_PATH)/src,*Test.java,.) \ - $(call find-files-in-subdirs,$(LOCAL_PATH)/backup/src,*Test.java,.) +LOCAL_ROBOTEST_FILES := $(call find-files-in-subdirs,$(LOCAL_PATH)/src,*Test.java,.) include external/robolectric-shadows/run_robotests.mk