diff options
| author | David Brazdil <dbrazdil@google.com> | 2018-01-20 11:43:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-20 11:43:40 +0000 |
| commit | ae5ba1e5cd4f131a93661ed71ae5b9fc0a67ea85 (patch) | |
| tree | 2ea0ecbf750ccb7354a5eeadd13eda1bee1f96e2 | |
| parent | ef131becd258fd6e7d39b43815cae2ce9e08069c (diff) | |
| parent | ccc31988eece3a828c478a38c3d2da03d0924968 (diff) | |
Merge "Generate new API signatures from doclava" am: fa208b4226 am: 72b7f03179
am: ccc31988ee
Change-Id: Ibc40df91d9aa4f1258856ddcd85204ce62297bf1
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 866d2a7b0e54..d823be2ef9f3 100644 --- a/Android.mk +++ b/Android.mk @@ -331,6 +331,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 @@ -340,7 +342,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 =================================== @@ -365,6 +369,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 @@ -375,7 +381,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 =================================== |