From cc88bdc14c8e2852438c4c4a77aca5518995e360 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Wed, 2 May 2018 15:47:32 +0100 Subject: [PATCH] Add rule to build hidden API blacklist Add a new Makefile rule 'hiddenapi-b-blacklist' which takes the manually published hiddenapi-p-light-greylist.txt and subtracts it from private-dex.txt built for the current branch. This is meant to provide an approximation of the blacklist in internal branches. Bug: 64382372 Test: make hiddenapi-aosp-blacklist Change-Id: I528a70cc6a71e988b53d94ca7ef81d6c181e5153 --- Android.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Android.mk b/Android.mk index 7ed30bc16cc31..d12708ccd97f9 100644 --- a/Android.mk +++ b/Android.mk @@ -614,6 +614,20 @@ $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): $(INTERNAL_PLATFORM_PRIVATE_DEX_A fi comm -23 <(sort $(PRIVATE_API)) <(sort $(BLACKLIST) $(DARK_GREYLIST)) > $@ +# Build AOSP blacklist +# ============================================================ +include $(CLEAR_VARS) + +LOCAL_LIGHT_GREYLIST_FILE := frameworks/base/config/hiddenapi-p-light-greylist.txt +LOCAL_BLACKLIST_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-aosp-blacklist.txt + +.PHONY: hiddenapi-aosp-blacklist +hiddenapi-aosp-blacklist: $(LOCAL_BLACKLIST_FILE) + +$(LOCAL_BLACKLIST_FILE): $(LOCAL_LIGHT_GREYLIST_FILE) $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) + LC_COLLATE=C comm -13 <(sort $(LOCAL_LIGHT_GREYLIST_FILE)) \ + <(sort $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)) > $@ + # Include subdirectory makefiles # ============================================================