diff options
| author | Andrei Onea <andreionea@google.com> | 2019-03-01 18:49:15 +0000 |
|---|---|---|
| committer | Andrei Onea <andreionea@google.com> | 2019-03-07 10:40:52 +0000 |
| commit | 80a5660238dbc5952a67169cf11a49e074ad966f (patch) | |
| tree | ad2df22d1e95c23dde5c09df7e6276622f8b6e66 /tools/hiddenapi/generate_hiddenapi_lists.py | |
| parent | 3275a6b2450745486cacf2fc7ed8d4075556e606 (diff) | |
Add extra hidden api related tags
@SystemApi and @TestApi entries in the whitelist can now be
differentiated from the rest of the apis. @TestApi methods
are implicitly greylisted.
Test: m test-art-host-gtest-hiddenapi_test
Change-Id: Id739f04550842f7b3160685e1635ba20efb223cc
Diffstat (limited to 'tools/hiddenapi/generate_hiddenapi_lists.py')
| -rwxr-xr-x | tools/hiddenapi/generate_hiddenapi_lists.py | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/tools/hiddenapi/generate_hiddenapi_lists.py b/tools/hiddenapi/generate_hiddenapi_lists.py index 2a8f69525eb8..6781eba05534 100755 --- a/tools/hiddenapi/generate_hiddenapi_lists.py +++ b/tools/hiddenapi/generate_hiddenapi_lists.py @@ -29,6 +29,9 @@ FLAG_BLACKLIST = "blacklist" FLAG_GREYLIST_MAX_O = "greylist-max-o" FLAG_GREYLIST_MAX_P = "greylist-max-p" FLAG_CORE_PLATFORM_API = "core-platform-api" +FLAG_PUBLIC_API = "public-api" +FLAG_SYSTEM_API = "system-api" +FLAG_TEST_API = "test-api" # List of all known flags. FLAGS_API_LIST = [ @@ -38,7 +41,12 @@ FLAGS_API_LIST = [ FLAG_GREYLIST_MAX_O, FLAG_GREYLIST_MAX_P, ] -ALL_FLAGS = FLAGS_API_LIST + [ FLAG_CORE_PLATFORM_API ] +ALL_FLAGS = FLAGS_API_LIST + [ + FLAG_CORE_PLATFORM_API, + FLAG_PUBLIC_API, + FLAG_SYSTEM_API, + FLAG_TEST_API, + ] FLAGS_API_LIST_SET = set(FLAGS_API_LIST) ALL_FLAGS_SET = set(ALL_FLAGS) @@ -203,14 +211,19 @@ class FlagsDict: # Iterate over all CSV lines, find entry in dict and append flags to it. for csv in csv_values: - self._dict[csv[0]].update(csv[1:]) + flags = csv[1:] + if (FLAG_PUBLIC_API in flags) or (FLAG_SYSTEM_API in flags): + flags.append(FLAG_WHITELIST) + elif FLAG_TEST_API in flags: + flags.append(FLAG_GREYLIST) + self._dict[csv[0]].update(flags) def assign_flag(self, flag, apis, source="<unknown>"): """Assigns a flag to given subset of entries. Args: flag (string): One of ALL_FLAGS. - apis (set): Subset of APIs to recieve the flag. + apis (set): Subset of APIs to receive the flag. source (string): Origin of `entries_subset`. Will be printed in error messages. Throws: |