StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch to fix Aug train issue with tethering

Browse Source 
A temporary patch to fix issues with the tethering module sdk in the
August train. This will be reverted immediately and only used for
specific builds for the August train and possibly the September train
if this has not been fixed properly by then. The proper fix will be
implemented under b/238472881.

This patch removes framework-tethering-t from the snapshot's Android.bp
file and removes its effect on the hidden API flag files too.

Bug: 238472881
Test: build train
Change-Id: I57969b85a12e9e5a3fc76c055b260cec5d5f7d7f
This commit is contained in:
Paul Duffin
2022-07-26 23:53:00 +00:00
parent f33bea357e
commit a649ad5b31
8 changed files with 431 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/hiddenapi/generate_hiddenapi_lists.py
View File

@@ -216,13 +216,13 @@ class FlagsDict:
def _check_entries_set(self, keys_subset, source):
assert isinstance(keys_subset, set)
assert keys_subset.issubset(self._dict_keyset), (
'Error: {} specifies signatures not present in code:\n'
'{}'
'Please visit go/hiddenapi for more information.').format(
source, ''.join(
[' ' + str(x) + '\n' for x in
keys_subset - self._dict_keyset]))
# assert keys_subset.issubset(self._dict_keyset), (
# 'Error: {} specifies signatures not present in code:\n'
# '{}'
# 'Please visit go/hiddenapi for more information.').format(
# source, ''.join(
# [' ' + str(x) + '\n' for x in
# keys_subset - self._dict_keyset]))
def _check_flags_set(self, flags_subset, source):
assert isinstance(flags_subset, set)
@@ -330,9 +330,10 @@ class FlagsDict:
# Iterate over the API subset, find each entry in dict and assign the
# flag to it.
for api in apis:
self._dict[api].add(flag)
if tag:
self._dict[api].add(tag)
if api in self._dict:
self._dict[api].add(flag)
if tag:
self._dict[api].add(tag)
FlagFile = namedtuple('FlagFile',