Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Blacklist @TestApis by default." am: 0753b42c3f

Browse Source 
am: d19b7b9dfa

Change-Id: I1f16646b101a7be21a24990f303bf48ddb45fe1b
This commit is contained in:
satayev
2019-11-15 11:13:44 -08:00
committed by android-build-merger
parent 23220f2726 d19b7b9dfa
commit 7593f165af
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/hiddenapi/generate_hiddenapi_lists.py
View File

@@ -241,8 +241,6 @@ class FlagsDict:
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>"):

18
tools/hiddenapi/generate_hiddenapi_lists_test.py
View File

@@ -53,14 +53,22 @@ class TestHiddenapiListGeneration(unittest.TestCase):
# Test new additions.
flags.parse_and_merge_csv([
'A,' + FLAG_GREYLIST,
'B,' + FLAG_BLACKLIST + ',' + FLAG_GREYLIST_MAX_O ])
self.assertEqual(flags.generate_csv(),
[ 'A,' + FLAG_GREYLIST,
'B,' + FLAG_BLACKLIST + "," + FLAG_GREYLIST_MAX_O ])
'B,' + FLAG_BLACKLIST + ',' + FLAG_GREYLIST_MAX_O,
'C,' + FLAG_SYSTEM_API + ',' + FLAG_WHITELIST,
'D,' + FLAG_GREYLIST+ ',' + FLAG_TEST_API,
'E,' + FLAG_BLACKLIST+ ',' + FLAG_TEST_API,
])
self.assertEqual(flags.generate_csv(), [
'A,' + FLAG_GREYLIST,
'B,' + FLAG_BLACKLIST + "," + FLAG_GREYLIST_MAX_O,
'C,' + FLAG_SYSTEM_API + ',' + FLAG_WHITELIST,
'D,' + FLAG_GREYLIST+ ',' + FLAG_TEST_API,
'E,' + FLAG_BLACKLIST+ ',' + FLAG_TEST_API,
])
# Test unknown flag.
with self.assertRaises(AssertionError):
flags.parse_and_merge_csv([ 'C,foo' ])
flags.parse_and_merge_csv([ 'Z,foo' ])
def test_assign_flag(self):
flags = FlagsDict()