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

Commit ccc31988 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

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

am: 72b7f031

Change-Id: I7dbf94c493bc79f4200afc45e6ed58543359c9ff
parents a8a799b6 72b7f031

Android.mk

+10 −2
Original line number Diff line number Diff line
@@ -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 ===================================