Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch all API builds to use template-sdk instead of (soon to be deleted) templates-sdk-dev. also update all non-DAC builds to use the "referenceonly" flag for a cleaner output and faster build.

Browse Source 
am: 534bfe1a4a

Change-Id: I9833fe119f6e5fef4cd74439c71d6a40fb5d5db9
This commit is contained in:
smain@google.com
2016-09-02 21:36:07 +00:00
committed by android-build-merger
parent d468597a79 534bfe1a4a
commit 63f29277bc
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Android.mk
View File

@@ -926,6 +926,7 @@ LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES
LOCAL_DROIDDOC_OPTIONS:=\ LOCAL_DROIDDOC_OPTIONS:=\
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-referenceonly \
-api $(INTERNAL_PLATFORM_API_FILE) \ -api $(INTERNAL_PLATFORM_API_FILE) \
-removedApi $(INTERNAL_PLATFORM_REMOVED_API_FILE) \ -removedApi $(INTERNAL_PLATFORM_REMOVED_API_FILE) \
-nodocs -nodocs
@@ -959,6 +960,7 @@ LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES
LOCAL_DROIDDOC_OPTIONS:=\ LOCAL_DROIDDOC_OPTIONS:=\
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-referenceonly \
-showAnnotation android.annotation.SystemApi \ -showAnnotation android.annotation.SystemApi \
-api $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \ -api $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \
-removedApi $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \ -removedApi $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \
@@ -993,6 +995,7 @@ LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES
LOCAL_DROIDDOC_OPTIONS:=\ LOCAL_DROIDDOC_OPTIONS:=\
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-referenceonly \
-stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_test_stubs_current_intermediates/src \ -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_test_stubs_current_intermediates/src \
-showAnnotation android.annotation.TestApi \ -showAnnotation android.annotation.TestApi \
-api $(INTERNAL_PLATFORM_TEST_API_FILE) \ -api $(INTERNAL_PLATFORM_TEST_API_FILE) \
@@ -1026,6 +1029,7 @@ LOCAL_MODULE := doc-comment-check
LOCAL_DROIDDOC_OPTIONS:=\ LOCAL_DROIDDOC_OPTIONS:=\
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-referenceonly \
-parsecomments -parsecomments
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
@@ -1064,7 +1068,7 @@ LOCAL_DROIDDOC_OPTIONS:=\
-sdkvalues $(OUT_DOCS) \ -sdkvalues $(OUT_DOCS) \
-hdf android.whichdoc offline -hdf android.whichdoc offline
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $(BUILD_DROIDDOC) include $(BUILD_DROIDDOC)
@@ -1101,7 +1105,7 @@ LOCAL_DROIDDOC_OPTIONS:=\
-hdf android.whichdoc offline \ -hdf android.whichdoc offline \
-referenceonly -referenceonly
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $(BUILD_DROIDDOC) include $(BUILD_DROIDDOC)
@@ -1139,7 +1143,7 @@ LOCAL_DROIDDOC_OPTIONS:= \
-hdf android.hasSamples true \ -hdf android.hasSamples true \
-samplesdir $(samples_dir) -samplesdir $(samples_dir)
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $(BUILD_DROIDDOC) include $(BUILD_DROIDDOC)
@@ -1163,6 +1167,7 @@ LOCAL_MODULE := online-system-api-sdk
LOCAL_DROIDDOC_OPTIONS:= \ LOCAL_DROIDDOC_OPTIONS:= \
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-referenceonly \
-showAnnotation android.annotation.SystemApi \ -showAnnotation android.annotation.SystemApi \
-title "Android SDK - Including system APIs." \ -title "Android SDK - Including system APIs." \
-toroot / \ -toroot / \
@@ -1206,7 +1211,7 @@ LOCAL_DROIDDOC_OPTIONS:= \
-hdf android.hasSamples true \ -hdf android.hasSamples true \
-samplesdir $(samples_dir) -samplesdir $(samples_dir)
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $(BUILD_DROIDDOC) include $(BUILD_DROIDDOC)
@@ -1234,7 +1239,7 @@ LOCAL_DROIDDOC_OPTIONS:= \
-devsite \ -devsite \
-ignoreJdLinks -ignoreJdLinks
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $(BUILD_DROIDDOC) include $(BUILD_DROIDDOC)
@@ -1263,7 +1268,7 @@ LOCAL_DROIDDOC_OPTIONS:= \
-hdf android.hasSamples true \ -hdf android.hasSamples true \
-samplesdir $(samples_dir) -samplesdir $(samples_dir)
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $(BUILD_DROIDDOC) include $(BUILD_DROIDDOC)
@@ -1282,6 +1287,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
LOCAL_MODULE := hidden LOCAL_MODULE := hidden
LOCAL_DROIDDOC_OPTIONS:=\ LOCAL_DROIDDOC_OPTIONS:=\
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-referenceonly \
-title "Android SDK - Including hidden APIs." -title "Android SDK - Including hidden APIs."
# -hidden # -hidden