[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
This commit is contained in:
Chandan Nath
2019-01-11 19:58:23 +00:00
parent 5068cada96
commit 242c7b5dcd

View File

@@ -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