summaryrefslogtreecommitdiff
path: root/PREUPLOAD.cfg
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2018-11-28 12:22:14 +0000
committerPaul Duffin <paulduffin@google.com>2018-11-29 09:41:56 +0000
commit00537c15e876d88a967d9f656ea8fadb1a4015ef (patch)
tree6a3f41d6b9b7b55dfa68029d7c8697a4c8b098c3 /PREUPLOAD.cfg
parent900ab8accef15f3a7622f0edccd53e99c44c03b7 (diff)
Prevent hiddenapi entries being added for libcore related projects
The libcore related projects (see below) have been (mostly) switched over to use UnsupportedAppUsage annotations, This change will prevent entries for those projects being added to a config/hiddenapi-* file. * libcore * external/bouncycastle * external/conscrypt * external/icu * external/okhttp * external/libphonenumber - still has a couple of entries in config/hiddenapi-light-greylist.txt due to limitations in UnsupportedAppUsage/class2greylist. Tested by attempting to upload the file with entries for libcore projects and without those entries and checking that the behavior is expected. Test: see above Bug: 117818301 Change-Id: I67a30b307e12e842b28cfb2160fab0029868fa06
Diffstat (limited to 'PREUPLOAD.cfg')
-rw-r--r--PREUPLOAD.cfg4
1 files changed, 3 insertions, 1 deletions
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 01df817ead56..e061b1548e58 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -13,7 +13,9 @@ api_lint_hook = ${REPO_ROOT}/frameworks/base/tools/apilint/apilint_sha.sh ${PREU
strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT}
-hidden_api_txt_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}
+hidden_api_txt_checksorted_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}
+
+hidden_api_txt_exclude_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/exclude.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}
owners_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "OWNERS$"