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

Commit a04964ba authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge changes I59bd6ec5,I48864d48,I9b46a4e2,I09a70f3e 

am: ba81a4d2

Change-Id: I8656226d30cb88df36c911b3da73674ee3d87130
parents 665737f1 ba81a4d2

test-base/Android.mk

+7 −2
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ 


LOCAL_PATH:= $(call my-dir)



# Generate the stub source files for legacy.test.stubs

# ====================================================

# For unbundled build we'll use the prebuilt jar from prebuilts/sdk.

ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))



# Generate the stub source files for android.test.base.stubs

# ==========================================================

include $(CLEAR_VARS)



LOCAL_SRC_FILES := \
@@ -107,6 +110,8 @@ update-android-test-base-api: $(ANDROID_TEST_BASE_OUTPUT_API_FILE) | $(ACP) 
	@echo Copying removed.txt

	$(hide) $(ACP) $(ANDROID_TEST_BASE_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_BASE_REMOVED_API_FILE)



endif  # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true



ifeq ($(HOST_OS),linux)

# Build the legacy-performance-test-hostdex library

# =================================================

test-runner/Android.mk

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


LOCAL_PATH:= $(call my-dir)



# For unbundled build we'll use the prebuilt jar from prebuilts/sdk.

ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))



# Generate the stub source files for android.test.runner.stubs

# ============================================================

include $(CLEAR_VARS)
@@ -69,9 +72,11 @@ LOCAL_JAVA_LIBRARIES := \ 
    android.test.mock.stubs \



LOCAL_SOURCE_FILES_ALL_GENERATED := true

LOCAL_SDK_VERSION := current



# Make sure to run droiddoc first to generate the stub source files.

LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_runner_api_gen_stamp)

android_test_runner_api_gen_stamp :=



include $(BUILD_STATIC_JAVA_LIBRARY)
@@ -109,3 +114,8 @@ update-android-test-runner-api: $(ANDROID_TEST_RUNNER_OUTPUT_API_FILE) | $(ACP) 
	$(hide) $(ACP) $(ANDROID_TEST_RUNNER_OUTPUT_API_FILE) $(ANDROID_TEST_RUNNER_API_FILE)

	@echo Copying removed.txt

	$(hide) $(ACP) $(ANDROID_TEST_RUNNER_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_RUNNER_REMOVED_API_FILE)



endif  # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true



# additionally, build unit tests in a separate .apk

include $(call all-makefiles-under,$(LOCAL_PATH))