From f16ac00fe828e092b16d8be66dfadb8dcf7366d6 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Fri, 26 Jan 2018 11:13:35 +0000 Subject: [PATCH] Copy hidden API blacklist/dark greylist into build folder This change is meant for ART buildbots which build against a pinned commit of the framework and thus do not have the commit which introduced hidden API lists. Normal builds will now copy the blacklist and dark greylist into the build folder first, and then generate the light greylist as usual. If a buildbot does not have the framework changes, it can create dummy API lists in the build folder before starting the build and avoid the issue. Test: make Bug: 64382372 Change-Id: Ib6e53a45bcc917abb4ba67fdcbf01d4a19c2d56f --- Android.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Android.mk b/Android.mk index 0e7c087c939c6..ea75b19c7ff8d 100644 --- a/Android.mk +++ b/Android.mk @@ -699,6 +699,16 @@ include $(BUILD_HOST_JAVA_LIBRARY) # ==== hiddenapi lists ======================================= +# Copy blacklist and dark greylist over into the build folder. +# This is for ART buildbots which need to mock these lists and have alternative +# rules for building them. Other rules in the build system should depend on the +# files in the build folder. + +$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-blacklist.txt,\ + $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST))) +$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-dark-greylist.txt,\ + $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST))) + # Generate light greylist as private API minus (blacklist plus dark greylist). $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)