summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorHui Shu <hush@google.com>2014-03-13 15:16:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 15:16:28 -0700
commitcdf01b1325cdf7375e39e465271530b85a8e3784 (patch)
treee17ec1f05d4768357a9d862c873197dd71035dd1 /Android.mk
parent0b55ac30ca417d4b1dc309c7107fc2fc79b60535 (diff)
parent57ad97fb701876ecb87b76f29592a41731aeb487 (diff)
downloadframeworks_base-cdf01b1325cdf7375e39e465271530b85a8e3784.zip
frameworks_base-cdf01b1325cdf7375e39e465271530b85a8e3784.tar.gz
frameworks_base-cdf01b1325cdf7375e39e465271530b85a8e3784.tar.bz2
am 57ad97fb: Merge "Add removeApi commandline option for doclava and an empty removed.txt"
* commit '57ad97fb701876ecb87b76f29592a41731aeb487': Add removeApi commandline option for doclava and an empty removed.txt
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 1d42528..c4c2179 100644
--- a/Android.mk
+++ b/Android.mk
@@ -629,6 +629,7 @@ LOCAL_DROIDDOC_OPTIONS:=\
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_stubs_current_intermediates/src \
-api $(INTERNAL_PLATFORM_API_FILE) \
+ -removedApi $(INTERNAL_PLATFORM_REMOVED_API_FILE) \
-nodocs
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk