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

Merge "Ignore 'extern "C++"' section in a version script"

Browse Source 
am: cd406fa70b

Change-Id: Idacb70a08fd8cfb6e12ca296d4950a74d5045a70
This commit is contained in:
dimitry
2017-12-21 18:30:17 +00:00
committed by android-build-merger
parent 21421c5faa cd406fa70b
commit 7edc7a525b
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cc/gen_stub_libs.py
View File

@@ -244,6 +244,7 @@ class SymbolFileParser(object):
tags = decode_api_level_tags(tags, self.api_map) tags = decode_api_level_tags(tags, self.api_map)
symbols = [] symbols = []
global_scope = True global_scope = True
cpp_symbols = False
while self.next_line() != '': while self.next_line() != '':
if '}' in self.current_line: if '}' in self.current_line:
# Line is something like '} BASE; # tags'. Both base and tags # Line is something like '} BASE; # tags'. Both base and tags
@@ -252,12 +253,17 @@ class SymbolFileParser(object):
base = base.partition('#')[0].strip() base = base.partition('#')[0].strip()
if not base.endswith(';'): if not base.endswith(';'):
raise ParseError( raise ParseError(
'Unterminated version block (expected ;).') 'Unterminated version/export "C++" block (expected ;).')
if cpp_symbols:
cpp_symbols = False
else:
base = base.rstrip(';').rstrip() base = base.rstrip(';').rstrip()
if base == '': if base == '':
base = None base = None
return Version(name, base, tags, symbols) return Version(name, base, tags, symbols)
elif ':' in self.current_line: elif 'extern "C++" {' in self.current_line:
cpp_symbols = True
elif not cpp_symbols and ':' in self.current_line:
visibility = self.current_line.split(':')[0].strip() visibility = self.current_line.split(':')[0].strip()
if visibility == 'local': if visibility == 'local':
global_scope = False global_scope = False
@@ -265,10 +271,10 @@ class SymbolFileParser(object):
global_scope = True global_scope = True
else: else:
raise ParseError('Unknown visiblity label: ' + visibility) raise ParseError('Unknown visiblity label: ' + visibility)
elif global_scope: elif global_scope and not cpp_symbols:
symbols.append(self.parse_symbol()) symbols.append(self.parse_symbol())
else: else:
# We're in a hidden scope. Ignore everything. # We're in a hidden scope or in 'extern "C++"' block. Ignore everything.
pass pass
raise ParseError('Unexpected EOF in version block.') raise ParseError('Unexpected EOF in version block.')