Skip to content

tp: open files with utf-8 encoding in gen_amalgamted_sql.py (#3343) #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdamus merged 1 commit into from
Oct 24, 2025
Merged

tp: open files with utf-8 encoding in gen_amalgamted_sql.py (#3343) #161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tools/gen_amalgamated_sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def main():

sql_files = []
if args.input_list_file:
with open(args.input_list_file, 'r') as input_list_file:
with open(args.input_list_file, 'r', encoding='utf-8') as input_list_file:
for line in input_list_file.read().splitlines():
sql_files.append(line)
else:
Expand All @@ -102,7 +102,7 @@ def main():
# Extract the SQL output from each file.
sql_outputs = {}
for file_name in sql_files:
with open(file_name, 'r') as f:
with open(file_name, 'r', encoding='utf-8') as f:
relpath = os.path.relpath(file_name, root_dir)

# We've had bugs (e.g. b/264711057) when Soong's common path logic breaks
Expand All @@ -111,7 +111,7 @@ def main():
assert '../' not in relpath
sql_outputs[relpath] = f.read()

with open(args.cpp_out, 'w+') as output:
with open(args.cpp_out, 'w+', encoding='utf-8') as output:
output.write(REPLACEMENT_HEADER)
output.write(NAMESPACE_BEGIN.format(args.namespace))

Expand Down