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

Commit 26b71b8c authored by Paul Duffin's avatar Paul Duffin Committed by Android (Google) Code Review
Browse files

Merge changes from topic "fix-atm-visibility-issues" 

* changes:
  Add android.test.mock.stubs-system
  Fix visibility issues with android.test.mock.stubs
parents 1824f66c a23c84c7

test-mock/Android.mk

+95 −1
Original line number Diff line number Diff line
@@ -16,7 +16,12 @@ 


LOCAL_PATH:= $(call my-dir)



android_test_mock_source_files := $(call all-java-files-under, src/android/test/mock)

# Includes the main framework source to ensure that doclava has access to the

# visibility information for the base classes of the mock classes. Without it

# otherwise hidden methods could be visible.

android_test_mock_source_files := \

    $(call all-java-files-under, src/android/test/mock) \

    $(call all-java-files-under, ../core/java) \



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

ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
@@ -67,6 +72,8 @@ LOCAL_SOURCE_FILES_ALL_GENERATED := true 
LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_mock_gen_stamp)

android_test_mock_gen_stamp :=



LOCAL_SDK_VERSION := current



include $(BUILD_STATIC_JAVA_LIBRARY)



# Archive a copy of the classes.jar in SDK build.
@@ -104,4 +111,91 @@ update-android-test-mock-api: $(ANDROID_TEST_MOCK_OUTPUT_API_FILE) | $(ACP) 
	@echo Copying removed.txt

	$(hide) $(ACP) $(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_MOCK_REMOVED_API_FILE)



# Generate the stub source files for android.test.mock.stubs-system

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

include $(CLEAR_VARS)

LOCAL_SRC_FILES := $(android_test_mock_source_files)



LOCAL_JAVA_LIBRARIES := core-oj core-libart framework

LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src/android/test/mock



ANDROID_TEST_MOCK_SYSTEM_OUTPUT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs-system_intermediates/api.txt

ANDROID_TEST_MOCK_SYSTEM_OUTPUT_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs-system_intermediates/removed.txt



ANDROID_TEST_MOCK_SYSTEM_API_FILE := $(LOCAL_PATH)/api/android-test-mock-system-current.txt

ANDROID_TEST_MOCK_SYSTEM_REMOVED_API_FILE := $(LOCAL_PATH)/api/android-test-mock-system-removed.txt



LOCAL_DROIDDOC_OPTIONS:= \

    -stubpackages android.test.mock \

    -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs-system_intermediates/src \

    -nodocs \

    -showAnnotation android.annotation.SystemApi \

    -api $(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_API_FILE) \

    -removedApi $(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_REMOVED_API_FILE) \



LOCAL_UNINSTALLABLE_MODULE := true

LOCAL_MODULE := android-test-mock-system-api-stubs-gen



include $(BUILD_DROIDDOC)



# Remember the target that will trigger the code generation.

android_test_mock_system_gen_stamp := $(full_target)



# Add some additional dependencies

$(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_API_FILE): $(full_target)

$(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_REMOVED_API_FILE): $(full_target)



# Build the android.test.mock.stubs-system library

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

include $(CLEAR_VARS)



LOCAL_MODULE := android.test.mock.stubs-system



LOCAL_SOURCE_FILES_ALL_GENERATED := true



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

LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_mock_system_gen_stamp)

android_test_mock_system_gen_stamp :=



LOCAL_SDK_VERSION := system_current



include $(BUILD_STATIC_JAVA_LIBRARY)



# Archive a copy of the classes.jar in SDK build.

$(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.mock.stubs_system.jar)



# Check that the android.test.mock.stubs-system library has not changed

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



# Check that the API we're building hasn't changed from the not-yet-released

# SDK version.

$(eval $(call check-api, \

    check-android-test-mock-system-api-current, \

    $(ANDROID_TEST_MOCK_SYSTEM_API_FILE), \

    $(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_API_FILE), \

    $(ANDROID_TEST_MOCK_SYSTEM_REMOVED_API_FILE), \

    $(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_REMOVED_API_FILE), \

    -error 2 -error 3 -error 4 -error 5 -error 6 \

    -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \

    -error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \

    -error 25 -error 26 -error 27, \

    cat $(LOCAL_PATH)/api/apicheck_msg_android_test_mock-system.txt, \

    check-android-test-mock-system-api, \

    $(call doc-timestamp-for,android-test-mock-system-api-stubs-gen) \

    ))



.PHONY: check-android-test-mock-system-api

checkapi: check-android-test-mock-system-api



.PHONY: update-android-test-mock-system-api

update-api: update-android-test-mock-system-api



update-android-test-mock-system-api: $(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_API_FILE) | $(ACP)

	@echo Copying current.txt

	$(hide) $(ACP) $(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_API_FILE) $(ANDROID_TEST_MOCK_SYSTEM_API_FILE)

	@echo Copying removed.txt

	$(hide) $(ACP) $(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_MOCK_SYSTEM_REMOVED_API_FILE)



endif  # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true