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

Merge "overrideflags: change local override list name" into main

Browse Source
This commit is contained in:
Zhi Dou
2023-10-23 20:55:15 +00:00
committed by Gerrit Code Review
parent 130bf250d2 b66973688e
commit 79a45fa178
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/aconfig/overrideflags/overrideflags.py
View File

@@ -28,12 +28,12 @@ import sys
_VALUE_LIST_TEMPLATE: str = """ _VALUE_LIST_TEMPLATE: str = """
VALUE_LIST_LIST = [{}] ACONFIG_VALUES_LIST_LOCAL = [{}]
""" """
_ACONFIG_VALUES_TEMPLATE: str = """ _ACONFIG_VALUES_TEMPLATE: str = """
aconfig_values {{ aconfig_values {{
name: "aconfig-local-{}", name: "{}",
package: "{}", package: "{}",
srcs: [ srcs: [
"{}", "{}",
@@ -41,6 +41,8 @@ aconfig_values {{
}} }}
""" """
_ACONFIG_VALUES_NAME_SUFFIX: str = "aconfig-local-override-{}"
_PACKAGE_REGEX = re.compile(r"^package\:\s*\"([\w\d\.]+)\"") _PACKAGE_REGEX = re.compile(r"^package\:\s*\"([\w\d\.]+)\"")
_ANDROID_BP_FILE_NAME = r"Android.bp" _ANDROID_BP_FILE_NAME = r"Android.bp"
@@ -61,13 +63,17 @@ def _parse_packages(file: pathlib.Path) -> set[str]:
def _create_android_bp(packages: set[str], file_name: str) -> str: def _create_android_bp(packages: set[str], file_name: str) -> str:
android_bp = "" android_bp = ""
value_list = ",\n ".join(map(lambda n: "aconfig-local-" + n, packages)) value_list = ",\n ".join(
map(f'"{_ACONFIG_VALUES_NAME_SUFFIX}"'.format, packages)
)
if value_list: if value_list:
value_list = "\n " + value_list + "\n" value_list = "\n " + value_list + "\n"
android_bp += _VALUE_LIST_TEMPLATE.format(value_list) + "\n" android_bp += _VALUE_LIST_TEMPLATE.format(value_list) + "\n"
for package in packages: for package in packages:
android_bp += _ACONFIG_VALUES_TEMPLATE.format(package, package, file_name) android_bp += _ACONFIG_VALUES_TEMPLATE.format(
_ACONFIG_VALUES_NAME_SUFFIX.format(package), package, file_name
)
android_bp += "\n" android_bp += "\n"
return android_bp return android_bp
@@ -78,8 +84,18 @@ def _write_android_bp(new_android_bp: str, out: pathlib.Path) -> None:
out.mkdir(parents=True, exist_ok=True) out.mkdir(parents=True, exist_ok=True)
output = out.joinpath(_ANDROID_BP_FILE_NAME) output = out.joinpath(_ANDROID_BP_FILE_NAME)
with open(output, "w+") as f: with open(output, "r+", encoding="utf8") as file:
f.write(new_android_bp) lines = []
for line in file:
line = line.rstrip("\n")
if line.startswith("ACONFIG_VALUES_LIST_LOCAL"):
break
lines.append(line)
# Overwrite the file with the updated contents.
file.seek(0)
file.truncate()
file.write("\n".join(lines))
file.write(new_android_bp)
def main(args): def main(args):