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

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

Merge changes from topic "vendor_property_enforce" 

* changes:
  Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig
  Add PRODUCT_SHIPPING_API_LEVEL to device config
parents 608b6912 0cac7b4a

android/config.go

+14 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import ( 
	"os"

	"path/filepath"

	"runtime"

	"strconv"

	"strings"

	"sync"
@@ -246,6 +247,7 @@ func TestConfig(buildDir string, env map[string]string, bp string, fs map[string 
			AAPTCharacteristics:               stringPtr("nosdcard"),

			AAPTPrebuiltDPI:                   []string{"xhdpi", "xxhdpi"},

			UncompressPrivAppDex:              boolPtr(true),

			ShippingApiLevel:                  stringPtr("30"),

		},



		buildDir:     buildDir,
@@ -1421,6 +1423,18 @@ func (c *deviceConfig) RecoverySnapshotModules() map[string]bool { 
	return c.config.productVariables.RecoverySnapshotModules

}



func (c *deviceConfig) ShippingApiLevel() ApiLevel {

	if c.config.productVariables.ShippingApiLevel == nil {

		return NoneApiLevel

	}

	apiLevel, _ := strconv.Atoi(*c.config.productVariables.ShippingApiLevel)

	return uncheckedFinalApiLevel(apiLevel)

}



func (c *deviceConfig) BuildBrokenVendorPropertyNamespace() bool {

	return c.config.productVariables.BuildBrokenVendorPropertyNamespace

}



// The ConfiguredJarList struct provides methods for handling a list of (apex, jar) pairs.

// Such lists are used in the build system for things like bootclasspath jars or system server jars.

// The apex part is either an apex name, or a special names "platform" or "system_ext". Jar is a

android/variable.go

+4 −0
Original line number Diff line number Diff line
@@ -367,6 +367,10 @@ type productVariables struct { 
	BoardMoveRecoveryResourcesToVendorBoot *bool `json:",omitempty"`



	PrebuiltHiddenApiDir *string `json:",omitempty"`



	ShippingApiLevel *string `json:",omitempty"`



	BuildBrokenVendorPropertyNamespace bool `json:",omitempty"`

}



func boolPtr(v bool) *bool {