From ea14c0c36f2ff5c18c2e62c71f50f01cef47f077 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Fri, 5 Oct 2018 14:41:03 +0100 Subject: Merge hidden API metadata into a single CSV file. Add a python script to merge the CSV files, dealing with the fact that the source columns may differ due to the annotation properties present in the source. Add this new file and the existing greylist.txt files as dependencies of the 'dist' target, so that they appear as artifacts on the build server. This allows them to be processed later by reading them from the build server. Test: m out/target/common/obj/PACKAGING/hiddenapi-greylist.csv Bug: 117314178 Change-Id: Ib9e5da90e4c32333a3f4f02ee7f159f77086ae5e --- Android.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index d33307425968..82a661af20d3 100644 --- a/Android.mk +++ b/Android.mk @@ -111,6 +111,17 @@ $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \ $(call commit-change-for-toc,$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)) $(call commit-change-for-toc,$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)) +$(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA): \ + frameworks/base/tools/hiddenapi/merge_csv.py \ + $(PRIVATE_METADATA_INPUTS) + frameworks/base/tools/hiddenapi/merge_csv.py $(PRIVATE_METADATA_INPUTS) > $@ + +$(call dist-for-goals,droidcore,$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST)) +$(call dist-for-goals,droidcore,$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)) +$(call dist-for-goals,droidcore,$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)) +$(call dist-for-goals,droidcore,$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)) +$(call dist-for-goals,droidcore,$(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA)) + # Include subdirectory makefiles # ============================================================ -- cgit v1.2.3