summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 3553f92ae5e7..bdad6c3d1483 100644
--- a/Android.mk
+++ b/Android.mk
@@ -264,7 +264,8 @@ framework_metalava_docs_LOCAL_DROIDDOC_OPTIONS := \
--hide RequiresPermission \
--hide MissingPermission --hide BroadcastBehavior \
--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol \
- --hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo
+ --hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo \
+ --include-annotation-classes tools/metalava/stub-annotations \
# ==== Public API diff ===========================
include $(CLEAR_VARS)
@@ -1002,9 +1003,9 @@ LOCAL_BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)
LOCAL_SRC_GREYLIST := frameworks/base/config/hiddenapi-light-greylist.txt
LOCAL_SRC_VENDOR_LIST := frameworks/base/config/hiddenapi-vendor-list.txt
LOCAL_SRC_FORCE_BLACKLIST := frameworks/base/config/hiddenapi-force-blacklist.txt
-LOCAL_SRC_PUBLIC_API := $(INTERNAL_PLATFORM_DEX_API_FILE)
-LOCAL_SRC_PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)
-LOCAL_SRC_REMOVED_API := $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)
+LOCAL_SRC_PUBLIC_API := frameworks/base/config/hiddenapi-public-dex.txt
+LOCAL_SRC_PRIVATE_API := frameworks/base/config/hiddenapi-private-dex.txt
+LOCAL_SRC_REMOVED_API := frameworks/base/config/hiddenapi-removed-dex.txt
LOCAL_SRC_ALL := \
$(LOCAL_SRC_GREYLIST) \