Merge "Generate new API signatures from doclava" am: fa208b4226

am: 72b7f03179

Change-Id: I7dbf94c493bc79f4200afc45e6ed58543359c9ff
This commit is contained in:
David Brazdil
2018-01-20 11:33:16 +00:00
committed by android-build-merger

View File

@@ -280,6 +280,8 @@ LOCAL_DROIDDOC_OPTIONS:=\
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-referenceonly \
-api $(INTERNAL_PLATFORM_API_FILE) \
-privateApi $(INTERNAL_PLATFORM_PRIVATE_API_FILE) \
-privateDexApi $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \
-removedApi $(INTERNAL_PLATFORM_REMOVED_API_FILE) \
-nodocs
@@ -289,7 +291,9 @@ LOCAL_UNINSTALLABLE_MODULE := true
include $(BUILD_DROIDDOC)
$(INTERNAL_PLATFORM_API_FILE): $(full_target)
$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_API_FILE) \
$(INTERNAL_PLATFORM_PRIVATE_API_FILE) \
$(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)
$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE))
# ==== the system api stubs ===================================
@@ -314,6 +318,8 @@ LOCAL_DROIDDOC_OPTIONS:=\
-referenceonly \
-showAnnotation android.annotation.SystemApi \
-api $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \
-privateApi $(INTERNAL_PLATFORM_SYSTEM_PRIVATE_API_FILE) \
-privateDexApi $(INTERNAL_PLATFORM_SYSTEM_PRIVATE_DEX_API_FILE) \
-removedApi $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \
-exactApi $(INTERNAL_PLATFORM_SYSTEM_EXACT_API_FILE) \
-nodocs
@@ -324,7 +330,9 @@ LOCAL_UNINSTALLABLE_MODULE := true
include $(BUILD_DROIDDOC)
$(INTERNAL_PLATFORM_SYSTEM_API_FILE): $(full_target)
$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \
$(INTERNAL_PLATFORM_SYSTEM_PRIVATE_API_FILE) \
$(INTERNAL_PLATFORM_SYSTEM_PRIVATE_DEX_API_FILE)
$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE))
# ==== the test api stubs ===================================