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

Commit 9b306200 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11180250 from a19cf007 to 24Q1-release 

Change-Id: I1d8197f03a2478272266d53de24c1bb8d83fc999
parents ffec910f a19cf007

android/config.go

+4 −0
Original line number Diff line number Diff line
@@ -1429,6 +1429,10 @@ func (c *config) IsVndkDeprecated() bool { 
	return !Bool(c.productVariables.KeepVndk)

}



func (c *config) VendorApiLevel() string {

	return String(c.productVariables.VendorApiLevel)

}



func (c *deviceConfig) Arches() []Arch {

	var arches []Arch

	for _, target := range c.config.Targets[Android] {

android/defs.go

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ func shellUnescape(s string) string { 


// ContentFromFileRuleForTests returns the content that was passed to a WriteFileRule for use

// in tests.

func ContentFromFileRuleForTests(t *testing.T, params TestingBuildParams) string {

func ContentFromFileRuleForTests(t *testing.T, ctx *TestContext, params TestingBuildParams) string {

	t.Helper()

	if g, w := params.Rule, writeFile; g != w {

		t.Errorf("expected params.Rule to be %q, was %q", w, g)

android/rule_builder.go

+2 −2
Original line number Diff line number Diff line
@@ -1341,9 +1341,9 @@ func (c *RuleBuilderCommand) String() string { 


// RuleBuilderSboxProtoForTests takes the BuildParams for the manifest passed to RuleBuilder.Sbox()

// and returns sbox testproto generated by the RuleBuilder.

func RuleBuilderSboxProtoForTests(t *testing.T, params TestingBuildParams) *sbox_proto.Manifest {

func RuleBuilderSboxProtoForTests(t *testing.T, ctx *TestContext, params TestingBuildParams) *sbox_proto.Manifest {

	t.Helper()

	content := ContentFromFileRuleForTests(t, params)

	content := ContentFromFileRuleForTests(t, ctx, params)

	manifest := sbox_proto.Manifest{}

	err := prototext.Unmarshal([]byte(content), &manifest)

	if err != nil {

android/rule_builder_test.go

+2 −2
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ func TestRuleBuilder_Build(t *testing.T) { 
			t.Errorf("want Deps = %q, got %q", blueprint.DepsGCC, params.Deps)

		}



		rspFile2Content := ContentFromFileRuleForTests(t, rspFile2Params)

		rspFile2Content := ContentFromFileRuleForTests(t, result.TestContext, rspFile2Params)

		AssertStringEquals(t, "rspFile2 content", "rsp_in2\n", rspFile2Content)

	}
@@ -797,7 +797,7 @@ func TestRuleBuilderHashInputs(t *testing.T) { 
		t.Run(test.name, func(t *testing.T) {

			t.Run("sbox", func(t *testing.T) {

				gen := result.ModuleForTests(test.name+"_sbox", "")

				manifest := RuleBuilderSboxProtoForTests(t, gen.Output("sbox.textproto"))

				manifest := RuleBuilderSboxProtoForTests(t, result.TestContext, gen.Output("sbox.textproto"))

				hash := manifest.Commands[0].GetInputHash()



				AssertStringEquals(t, "hash", test.expectedHash, hash)

android/variable.go

+10 −0
Original line number Diff line number Diff line
@@ -226,6 +226,8 @@ type ProductVariables struct { 
	DeviceMaxPageSizeSupported            *string  `json:",omitempty"`

	DevicePageSizeAgnostic                *bool    `json:",omitempty"`



	VendorApiLevel *string `json:",omitempty"`



	RecoverySnapshotVersion *string `json:",omitempty"`



	DeviceSecondaryArch        *string  `json:",omitempty"`
@@ -618,6 +620,14 @@ func (v *ProductVariables) SetDefaultConfig() { 
	}

}



func (this *ProductVariables) GetBuildFlagBool(flag string) bool {

	val, ok := this.BuildFlags[flag]

	if !ok {

		return false

	}

	return val == "true"

}



// ProductConfigContext requires the access to the Module to get product config properties.

type ProductConfigContext interface {

	Module() Module