diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Android.bp | 8 | ||||
| -rwxr-xr-x | scripts/buildinfo.py | 82 | ||||
| -rw-r--r-- | scripts/merge_json.py | 62 |
3 files changed, 127 insertions, 25 deletions
diff --git a/scripts/Android.bp b/scripts/Android.bp index 80cd93579..57766edba 100644 --- a/scripts/Android.bp +++ b/scripts/Android.bp @@ -292,6 +292,14 @@ python_binary_host { } python_binary_host { + name: "merge_json", + main: "merge_json.py", + srcs: [ + "merge_json.py", + ], +} + +python_binary_host { name: "buildinfo", main: "buildinfo.py", srcs: ["buildinfo.py"], diff --git a/scripts/buildinfo.py b/scripts/buildinfo.py index e4fb0da09..3383bf76c 100755 --- a/scripts/buildinfo.py +++ b/scripts/buildinfo.py @@ -18,46 +18,78 @@ import argparse import contextlib +import json +import os import subprocess +TEST_KEY_DIR = "build/make/target/product/security" + +def get_build_variant(product_config): + if product_config["Eng"]: + return "eng" + elif product_config["Debuggable"]: + return "userdebug" + else: + return "user" + +def get_build_flavor(product_config): + build_flavor = product_config["DeviceProduct"] + "-" + get_build_variant(product_config) + if "address" in product_config.get("SanitizeDevice", []) and "_asan" not in build_flavor: + build_flavor += "_asan" + return build_flavor + +def get_build_keys(product_config): + default_cert = product_config.get("DefaultAppCertificate", "") + if default_cert == "" or default_cert == os.path.join(TEST_KEY_DIR, "testKey"): + return "test-keys" + return "dev-keys" + def parse_args(): """Parse commandline arguments.""" parser = argparse.ArgumentParser() - parser.add_argument('--use-vbmeta-digest-in-fingerprint', action='store_true') - parser.add_argument('--build-flavor', required=True) parser.add_argument('--build-hostname-file', required=True, type=argparse.FileType('r')), - parser.add_argument('--build-id', required=True) - parser.add_argument('--build-keys', required=True) parser.add_argument('--build-number-file', required=True, type=argparse.FileType('r')) parser.add_argument('--build-thumbprint-file', type=argparse.FileType('r')) - parser.add_argument('--build-type', required=True) parser.add_argument('--build-username', required=True) - parser.add_argument('--build-variant', required=True) - parser.add_argument('--cpu-abis', action='append', required=True) parser.add_argument('--date-file', required=True, type=argparse.FileType('r')) - parser.add_argument('--default-locale') - parser.add_argument('--default-wifi-channels', action='append', default=[]) - parser.add_argument('--device', required=True) - parser.add_argument("--display-build-number", action='store_true') - parser.add_argument('--platform-base-os', required=True) - parser.add_argument('--platform-display-version', required=True) - parser.add_argument('--platform-min-supported-target-sdk-version', required=True) parser.add_argument('--platform-preview-sdk-fingerprint-file', required=True, type=argparse.FileType('r')) - parser.add_argument('--platform-preview-sdk-version', required=True) - parser.add_argument('--platform-sdk-version', required=True) - parser.add_argument('--platform-security-patch', required=True) - parser.add_argument('--platform-version', required=True) - parser.add_argument('--platform-version-codename',required=True) - parser.add_argument('--platform-version-all-codenames', action='append', required=True) - parser.add_argument('--platform-version-known-codenames', required=True) - parser.add_argument('--platform-version-last-stable', required=True) - parser.add_argument('--product', required=True) - + parser.add_argument('--product-config', required=True, type=argparse.FileType('r')) parser.add_argument('--out', required=True, type=argparse.FileType('w')) - return parser.parse_args() + option = parser.parse_args() + + product_config = json.load(option.product_config) + build_flags = product_config["BuildFlags"] + + option.build_flavor = get_build_flavor(product_config) + option.build_keys = get_build_keys(product_config) + option.build_id = product_config["BuildId"] + option.build_type = product_config["BuildType"] + option.build_variant = get_build_variant(product_config) + option.cpu_abis = product_config["DeviceAbi"] + option.default_locale = None + if len(product_config.get("ProductLocales", [])) > 0: + option.default_locale = product_config["ProductLocales"][0] + option.default_wifi_channels = product_config.get("ProductDefaultWifiChannels", []) + option.device = product_config["DeviceName"] + option.display_build_number = product_config["DisplayBuildNumber"] + option.platform_base_os = product_config["Platform_base_os"] + option.platform_display_version = product_config["Platform_display_version_name"] + option.platform_min_supported_target_sdk_version = build_flags["RELEASE_PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION"] + option.platform_preview_sdk_version = product_config["Platform_preview_sdk_version"] + option.platform_sdk_version = product_config["Platform_sdk_version"] + option.platform_security_patch = product_config["Platform_security_patch"] + option.platform_version = product_config["Platform_version_name"] + option.platform_version_codename = product_config["Platform_sdk_codename"] + option.platform_version_all_codenames = product_config["Platform_version_active_codenames"] + option.platform_version_known_codenames = product_config["Platform_version_known_codenames"] + option.platform_version_last_stable = product_config["Platform_version_last_stable"] + option.product = product_config["DeviceProduct"] + option.use_vbmeta_digest_in_fingerprint = product_config["BoardUseVbmetaDigestInFingerprint"] + + return option def main(): option = parse_args() diff --git a/scripts/merge_json.py b/scripts/merge_json.py new file mode 100644 index 000000000..7e2f6eb51 --- /dev/null +++ b/scripts/merge_json.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# +# Copyright 2024 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +"""A tool for merging two or more JSON files.""" + +import argparse +import logging +import json +import sys + +def parse_args(): + """Parse commandline arguments.""" + + parser = argparse.ArgumentParser() + parser.add_argument("output", help="output JSON file", type=argparse.FileType("w")) + parser.add_argument("input", help="input JSON files", nargs="+", type=argparse.FileType("r")) + return parser.parse_args() + +def main(): + """Program entry point.""" + args = parse_args() + merged_dict = {} + has_error = False + logger = logging.getLogger(__name__) + + for json_file in args.input: + try: + data = json.load(json_file) + except json.JSONDecodeError as e: + logger.error(f"Error parsing JSON in file: {json_file.name}. Reason: {e}") + has_error = True + continue + + for key, value in data.items(): + if key not in merged_dict: + merged_dict[key] = value + elif merged_dict[key] == value: + logger.warning(f"Duplicate key '{key}' with identical values found.") + else: + logger.error(f"Conflicting values for key '{key}': {merged_dict[key]} != {value}") + has_error = True + + if has_error: + sys.exit(1) + + json.dump(merged_dict, args.output) + +if __name__ == "__main__": + main() |