Merge "[Roboelectric] Split Robolectric frameworks services targets" (003ad52f) · Commits · e / os / android_frameworks_base

services/robotests/Android.mk

+12 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,8 @@ include $(CLEAR_VARS)

		LOCAL_MODULE := FrameworksServicesRoboTests

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

		LOCAL_RESOURCE_DIR := \
		$(LOCAL_PATH)/res
		@@ -81,4 +82,13 @@ 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,.)

		include external/robolectric-shadows/run_robotests.mk

		###################################################################
		# include subdir Android.mk files
		###################################################################
		include $(CLEAR_VARS)
		include $(call all-makefiles-under,$(LOCAL_PATH))

services/robotests/backup/Android.mk

0 → 100644

+84 −0

Original line number	Diff line number	Diff line
		# Copyright (C) 2018 The Android Open Source Project
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.

		LOCAL_PATH := $(call my-dir)

		###################################################################
		# BackupFrameworksServicesLib app just for Robolectric test target #
		###################################################################
		include $(CLEAR_VARS)

		LOCAL_PACKAGE_NAME := BackupFrameworksServicesLib
		LOCAL_PRIVATE_PLATFORM_APIS := true
		LOCAL_MODULE_TAGS := optional

		LOCAL_PRIVILEGED_MODULE := true

		LOCAL_STATIC_JAVA_LIBRARIES := \
		bmgrlib \
		bu \
		services.backup \
		services.core \
		services.net

		include $(BUILD_PACKAGE)

		###################################################################
		# BackupFrameworksServicesLib Robolectric test target. #
		###################################################################
		include $(CLEAR_VARS)

		LOCAL_MODULE := BackupFrameworksServicesRoboTests

		LOCAL_SRC_FILES := $(call all-java-files-under, src) \
		$(call all-java-files-under, ../src/com/android/server/testing/shadows)

		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

		LOCAL_JAVA_RESOURCE_DIRS := config

		# Include the testing libraries
		LOCAL_JAVA_LIBRARIES := \
		platform-test-annotations \
		robolectric_android-all-stub \
		Robolectric_all-target \
		mockito-robolectric-prebuilt \
		truth-prebuilt \
		testng

		LOCAL_INSTRUMENTATION_FOR := BackupFrameworksServicesLib

		LOCAL_MODULE_TAGS := optional

		include $(BUILD_STATIC_JAVA_LIBRARY)

		###################################################################
		# BackupFrameworksServicesLib runner target to run the previous target. #
		###################################################################
		include $(CLEAR_VARS)

		LOCAL_MODULE := RunBackupFrameworksServicesRoboTests

		LOCAL_JAVA_LIBRARIES := \
		BackupFrameworksServicesRoboTests \
		platform-test-annotations \
		robolectric_android-all-stub \
		Robolectric_all-target \
		mockito-robolectric-prebuilt \
		truth-prebuilt \
		testng

		LOCAL_TEST_PACKAGE := BackupFrameworksServicesLib

		include external/robolectric-shadows/run_robotests.mk

services/robotests/backup/config/robolectric.properties

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		sdk=NEWEST_SDK
		No newline at end of file

services/robotests/src/android/app/backup/BackupUtilsTest.java→services/robotests/backup/src/android/app/backup/BackupUtilsTest.java

+0 −0

File moved.

View file

services/robotests/src/android/app/backup/ForwardingBackupAgent.java→services/robotests/backup/src/android/app/backup/ForwardingBackupAgent.java

+0 −0

File moved.

View file