From 2e36f527384badb0a095e47f93f79b501fac342e Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Fri, 26 Jan 2018 11:07:18 +0000 Subject: [PATCH] Move locations of all hidden API lists into the build folder ART buildbots are broken because they build against a pinned commit of the framework and thus lack the build rules to generate hidden API lists We aim to fix this by generating dummy API lists in the build folder. This patch changes the location of the blacklist and dark greylist from frameworks/base/config/ to ${TARGET_COMMON_OUT_INTERMEDIATES}/... . On normal builds, the framework will copy its text files into the build folder. Test: make Bug: 64382372 Change-Id: I9b55d2865599e367d9c4be4f834182f5c084c3bf --- core/config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/config.mk b/core/config.mk index 6883d20e05..336216879a 100644 --- a/core/config.mk +++ b/core/config.mk @@ -948,8 +948,8 @@ INTERNAL_PLATFORM_TEST_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PA INTERNAL_PLATFORM_TEST_EXACT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/test-exact.txt INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-light-greylist.txt -INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST := frameworks/base/config/hiddenapi-dark-greylist.txt -INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST := frameworks/base/config/hiddenapi-blacklist.txt +INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-dark-greylist.txt +INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-blacklist.txt # This is the standard way to name a directory containing prebuilt target # objects. E.g., prebuilt/$(TARGET_PREBUILT_TAG)/libc.so