diff options
| -rw-r--r-- | android/variable.go | 3 | ||||
| -rw-r--r-- | scripts/gen_build_prop.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/android/variable.go b/android/variable.go index 34a3d3041..c35294200 100644 --- a/android/variable.go +++ b/android/variable.go @@ -241,7 +241,8 @@ type ProductVariables struct { DeviceMaxPageSizeSupported *string `json:",omitempty"` DeviceNoBionicPageSizeMacro *bool `json:",omitempty"` - VendorApiLevel *string `json:",omitempty"` + VendorApiLevel *string `json:",omitempty"` + VendorApiLevelPropOverride *string `json:",omitempty"` DeviceSecondaryArch *string `json:",omitempty"` DeviceSecondaryArchVariant *string `json:",omitempty"` diff --git a/scripts/gen_build_prop.py b/scripts/gen_build_prop.py index c08a3fd42..df9e98d1e 100644 --- a/scripts/gen_build_prop.py +++ b/scripts/gen_build_prop.py @@ -429,7 +429,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"]: |