diff options
author | Nan Zhang <nanzhang@google.com> | 2018-04-13 14:48:32 -0700 |
---|---|---|
committer | Nan Zhang <nanzhang@google.com> | 2018-04-13 14:55:16 -0700 |
commit | 3fece48098e12b3e8110faa3fff378e5526bf887 (patch) | |
tree | 21c29bf5d52af03a2a8191c6d2fe594944ede2f8 /test-base | |
parent | 828f14d58aeabfbdd9af77ae56f061dd7baf63de (diff) | |
download | base-3fece48098e12b3e8110faa3fff378e5526bf887.tar.gz |
Migrate android.test.base.stubs generation to Soong.
Bug: b/70351683
Test: m clean && m check-android-test-base-api
and compare the old and new stubs.jar using md5sum.
Change-Id: Ia9273016c4d3472888f970cbddf0ed85c0501eb3
Diffstat (limited to 'test-base')
-rw-r--r-- | test-base/Android.bp | 35 | ||||
-rw-r--r-- | test-base/Android.mk | 63 |
2 files changed, 42 insertions, 56 deletions
diff --git a/test-base/Android.bp b/test-base/Android.bp index 4d149f7c8919..a0e39856e9c7 100644 --- a/test-base/Android.bp +++ b/test-base/Android.bp @@ -81,3 +81,38 @@ java_library_static { "junit", ], } + +droiddoc { + name: "android-test-base-api-stubs-gen-docs", + srcs: [ + "src/**/*.java", + ], + custom_template: "droiddoc-templates-sdk", + installable: false, + args: "-stubpackages android.test:" + + "android.test.suitebuilder.annotation:" + + "com.android.internal.util:" + + "junit.framework -stubsourceonly -nodocs", + sdk_version: "current", + api_tag_name: "ANDROID_TEST_BASE", + api_filename: "android-test-base-api.txt", + removed_api_filename: "android-test-base-removed.txt", +} + +// Build the android.test.base.stubs library +// ========================================= +java_library_static { + name: "android.test.base.stubs", + srcs: [ + ":android-test-base-api-stubs-gen-docs", + ], + product_variables: { + pdk: { + enabled: false, + }, + unbundled_build: { + enabled: false, + }, + }, + sdk_version: "current", +} diff --git a/test-base/Android.mk b/test-base/Android.mk index ebb33deb42d3..baf5726ff8bd 100644 --- a/test-base/Android.mk +++ b/test-base/Android.mk @@ -19,59 +19,10 @@ 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.base.stubs -# ========================================================== -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) - -LOCAL_SDK_VERSION := current - -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src - -ANDROID_TEST_BASE_OUTPUT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.base.stubs_intermediates/api.txt -ANDROID_TEST_BASE_OUTPUT_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.base.stubs_intermediates/removed.txt - ANDROID_TEST_BASE_API_FILE := $(LOCAL_PATH)/api/android-test-base-current.txt ANDROID_TEST_BASE_REMOVED_API_FILE := $(LOCAL_PATH)/api/android-test-base-removed.txt -LOCAL_DROIDDOC_OPTIONS:= \ - -stubpackages android.test:android.test.suitebuilder.annotation:com.android.internal.util:junit.framework \ - -stubsourceonly \ - -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.base.stubs_intermediates/src \ - -nodocs \ - -api $(ANDROID_TEST_BASE_OUTPUT_API_FILE) \ - -removedApi $(ANDROID_TEST_BASE_OUTPUT_REMOVED_API_FILE) \ - -LOCAL_UNINSTALLABLE_MODULE := true -LOCAL_MODULE := android-test-base-api-stubs-gen - -include $(BUILD_DROIDDOC) - -# Remember the target that will trigger the code generation. -android_test_base_gen_stamp := $(full_target) - -# Add some additional dependencies -$(ANDROID_TEST_BASE_OUTPUT_API_FILE): $(full_target) -$(ANDROID_TEST_BASE_OUTPUT_REMOVED_API_FILE): $(full_target) - -# Build the android.test.base.stubs library -# ========================================= -include $(CLEAR_VARS) - -LOCAL_MODULE := android.test.base.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_base_gen_stamp) -android_test_base_gen_stamp := - -include $(BUILD_STATIC_JAVA_LIBRARY) - +full_classes_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,android.test.base.stubs,,COMMON)/classes.jar # Archive a copy of the classes.jar in SDK build. $(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.base.stubs.jar) @@ -83,16 +34,16 @@ $(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.base.stubs.ja $(eval $(call check-api, \ check-android-test-base-api-current, \ $(ANDROID_TEST_BASE_API_FILE), \ - $(ANDROID_TEST_BASE_OUTPUT_API_FILE), \ + $(INTERNAL_PLATFORM_ANDROID_TEST_BASE_API_FILE), \ $(ANDROID_TEST_BASE_REMOVED_API_FILE), \ - $(ANDROID_TEST_BASE_OUTPUT_REMOVED_API_FILE), \ + $(INTERNAL_PLATFORM_ANDROID_TEST_BASE_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_base.txt, \ check-android-test-base-api, \ - $(call doc-timestamp-for,android-test-base-api-stubs-gen) \ + $(OUT_DOCS)/android-test-base-api-stubs-gen-docs-stubs.srcjar \ )) .PHONY: check-android-test-base-api @@ -101,11 +52,11 @@ checkapi: check-android-test-base-api .PHONY: update-android-test-base-api update-api: update-android-test-base-api -update-android-test-base-api: $(ANDROID_TEST_BASE_OUTPUT_API_FILE) | $(ACP) +update-android-test-base-api: $(INTERNAL_PLATFORM_ANDROID_TEST_BASE_API_FILE) | $(ACP) @echo Copying current.txt - $(hide) $(ACP) $(ANDROID_TEST_BASE_OUTPUT_API_FILE) $(ANDROID_TEST_BASE_API_FILE) + $(hide) $(ACP) $(INTERNAL_PLATFORM_ANDROID_TEST_BASE_API_FILE) $(ANDROID_TEST_BASE_API_FILE) @echo Copying removed.txt - $(hide) $(ACP) $(ANDROID_TEST_BASE_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_BASE_REMOVED_API_FILE) + $(hide) $(ACP) $(INTERNAL_PLATFORM_ANDROID_TEST_BASE_REMOVED_API_FILE) $(ANDROID_TEST_BASE_REMOVED_API_FILE) endif # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true |