From 17d16e84da23464dc7a621eaa87a79c6cc1170ce Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Thu, 13 Dec 2018 17:00:09 +0000 Subject: hiddenapi: Expect public/private API as CSV Refactor of `hiddenapi` changed the output format of public/private API lists to a single CSV file. Change API list generation accordingly. In order to avoid special-casing this CSV file, it is treated the same as the CSV files produced by `class2greylist`. The merging rules are relaxed so that signatures in CSV files are not checked against a pre-initialized set of all signatures (previously generated from the public/private API files). This should not lead to build errors as the CSV files are always auto-generated, and a missing/extra signature will be caught by `hiddenapi`. API lists in frameworks/base/config are processed later and checked that they are a subset of the signatures in CSV. Bug: 119068555 Test: compiles, hiddenapi-flags.csv unchanged Change-Id: I33f2cbaa15f2d423a75e6ca64abe1c5b0c40c86f --- Android.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 9f7bf9905c09..e4053452a9c5 100644 --- a/Android.mk +++ b/Android.mk @@ -87,14 +87,11 @@ $(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): \ frameworks/base/config/hiddenapi-greylist-max-p.txt \ frameworks/base/config/hiddenapi-greylist-max-o.txt \ frameworks/base/config/hiddenapi-force-blacklist.txt \ - $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \ - $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \ + $(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS) \ $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) \ $(SOONG_HIDDENAPI_FLAGS) frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py \ - --public $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \ - --private $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \ - --csv $(PRIVATE_FLAGS_INPUTS) \ + --csv $(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS) $(PRIVATE_FLAGS_INPUTS) \ --greylist frameworks/base/config/hiddenapi-greylist.txt \ --greylist-ignore-conflicts $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) \ --greylist-max-p frameworks/base/config/hiddenapi-greylist-max-p.txt \ -- cgit v1.2.3