diff options
| author | 2024-10-24 23:11:04 +0000 | |
|---|---|---|
| committer | 2024-10-24 23:11:04 +0000 | |
| commit | a5d80d810137bf15b7ffaeb1696f96e82418c4d2 (patch) | |
| tree | b35494fbe795cb9fbbde251d0021e2f01565642f /scripts/gen_build_prop.py | |
| parent | 87f82ba1039d186a160543c7918090e9f0080829 (diff) | |
| parent | c7458ed324710c9f8271a5e8d08724fe538a9e28 (diff) | |
Merge "Define VendorApiLevelPropOverride for GRF prop" into main am: 17d5d89124 am: c7458ed324
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3316635
Change-Id: I28569d756bd2142268ba7b6c7c1a18cec004382a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'scripts/gen_build_prop.py')
| -rw-r--r-- | scripts/gen_build_prop.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/gen_build_prop.py b/scripts/gen_build_prop.py index 89e6f8d10..35357f83d 100644 --- a/scripts/gen_build_prop.py +++ b/scripts/gen_build_prop.py @@ -430,7 +430,9 @@ def append_additional_vendor_props(args): # Build system set BOARD_API_LEVEL to show the api level of the vendor API surface. # This must not be altered outside of build system. if config["VendorApiLevel"]: - props.append(f"ro.board.api_level={config['VendorApiLevel']}") + props.append(f"ro.board.api_level?={config['VendorApiLevel']}") + if config["VendorApiLevelPropOverride"]: + props.append(f"ro.board.api_level={config['VendorApiLevelPropOverride']}") # RELEASE_BOARD_API_LEVEL_FROZEN is true when the vendor API surface is frozen. if build_flags["RELEASE_BOARD_API_LEVEL_FROZEN"]: |