Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17d5d891 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Define VendorApiLevelPropOverride for GRF prop" into main

parents 39bebd10 3f84f6ea
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ type ProductVariables struct {
	DeviceNoBionicPageSizeMacro           *bool    `json:",omitempty"`

	VendorApiLevel             *string `json:",omitempty"`
	VendorApiLevelPropOverride *string `json:",omitempty"`

	DeviceSecondaryArch        *string  `json:",omitempty"`
	DeviceSecondaryArchVariant *string  `json:",omitempty"`
+3 −1
Original line number Diff line number Diff line
@@ -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"]: