diff options
author | Hui Shu <hush@google.com> | 2014-03-13 22:12:01 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-13 22:12:02 +0000 |
commit | 90267eb7970015d06ca7b12b5049289b4811ea85 (patch) | |
tree | d783d41919897afc5cf1d08e909f302a91b9b057 | |
parent | aa2183cbbc10d3a313777ec4e7eba3675da6f9cb (diff) | |
parent | ab38a3547a4f86790b552c8e6524cdbd184cc6d1 (diff) | |
download | testing-90267eb7970015d06ca7b12b5049289b4811ea85.tar.gz |
Merge "Edit checkapi command parameters accordingly to check for @removed APIs."
-rw-r--r-- | uiautomator/api/removed.txt | 0 | ||||
-rw-r--r-- | uiautomator/library/Android.mk | 14 |
2 files changed, 11 insertions, 3 deletions
diff --git a/uiautomator/api/removed.txt b/uiautomator/api/removed.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/uiautomator/api/removed.txt diff --git a/uiautomator/library/Android.mk b/uiautomator/library/Android.mk index 470e8ab..e3453b1 100644 --- a/uiautomator/library/Android.mk +++ b/uiautomator/library/Android.mk @@ -21,6 +21,8 @@ uiautomator.core_src_files := $(call all-java-files-under, core-src) \ uiautomator.core_java_libraries := android.test.runner core-junit uiautomator_internal_api_file := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/uiautomator_api.txt +uiautomator_internal_removed_api_file := \ + $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/uiautomator_removed_api.txt ############################################### include $(CLEAR_VARS) @@ -42,7 +44,8 @@ LOCAL_DROIDDOC_HTML_DIR := LOCAL_DROIDDOC_OPTIONS:= \ -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiautomator_intermediates/src \ -stubpackages com.android.uiautomator.core:com.android.uiautomator.testrunner \ - -api $(uiautomator_internal_api_file) + -api $(uiautomator_internal_api_file) \ + -removedApi $(uiautomator_internal_removed_api_file) LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR := build/tools/droiddoc/templates-sdk LOCAL_UNINSTALLABLE_MODULE := true @@ -83,6 +86,8 @@ $(eval $(call check-api, \ uiautomator-checkapi-last, \ $(uiautomator_api_dir)/$(last_released_sdk_version).txt, \ $(uiautomator_internal_api_file), \ + $(uiautomator_api_dir)/removed.txt, \ + $(uiautomator_internal_removed_api_file), \ $(checkapi_last_error_level_flags), \ cat $(LOCAL_PATH)/apicheck_msg_last.txt, \ $(uiautomator_stubs_jar), \ @@ -100,6 +105,8 @@ $(eval $(call check-api, \ uiautomator-checkapi-current, \ $(uiautomator_api_dir)/current.txt, \ $(uiautomator_internal_api_file), \ + $(uiautomator_api_dir)/removed.txt, \ + $(uiautomator_internal_removed_api_file), \ $(checkapi_current_error_level_flags), \ cat $(LOCAL_PATH)/apicheck_msg_current.txt, \ $(uiautomator_stubs_jar), \ @@ -109,8 +116,9 @@ $(eval $(call check-api, \ update-uiautomator-api: PRIVATE_API_DIR := $(uiautomator_api_dir) update-uiautomator-api: $(uiautomator_internal_api_file) | $(ACP) @echo Copying uiautomator current.txt - $(hide) $(ACP) $< $(PRIVATE_API_DIR)/current.txt - + $(hide) $(ACP) $(uiautomator_internal_api_file) $(PRIVATE_API_DIR)/current.txt + @echo Copying uiautomator removed.txt + $(hide) $(ACP) $(uiautomator_internal_removed_api_file) $(PRIVATE_API_DIR)/removed.txt ############################################### # clean up temp vars uiautomator.core_src_files := |