summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2018-03-29 15:04:15 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-29 15:04:15 +0000
commit55d013b0fa476f6e1d51deb8e62f40f6b9e14028 (patch)
tree8a75dcaee16b51afcd39ee1778d49516774d227d /Android.mk
parent5351429200b6a7e9f8acf75c7905df44009d33a4 (diff)
parent73a66276e339ae03e065231dc598affc3da85130 (diff)
Merge "Federate platform docs against AndroidX" into pi-dev
am: 73a66276e3 Change-Id: I037ae591cb7fbdf33260ff7494a28a0ae22919c1
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index d79e1cf30e46..e786282cf14e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -252,6 +252,11 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \
-federate SupportLib https://developer.android.com \
-federationapi SupportLib prebuilts/sdk/current/support-api.txt
+# Federate AndroidX references against local API file.
+framework_docs_LOCAL_DROIDDOC_OPTIONS += \
+ -federate AndroidX https://developer.android.com \
+ -federationapi AndroidX prebuilts/sdk/current/androidx-api.txt
+
# ==== Public API diff ===========================
include $(CLEAR_VARS)