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

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

Merge changes I26dcc412,I2153d87f into main 

* changes:
  Make vintf_fragment modules use the common arch
  Hide windows genrules from make
parents cc41b051 8ea25038

android/vintf_fragment.go

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ func vintfLibraryFactory() Module { 
	m.AddProperties(

		&m.properties,

	)

	InitAndroidArchModule(m, DeviceSupported, MultilibFirst)

	InitAndroidArchModule(m, DeviceSupported, MultilibCommon)



	return m

}

android/vintf_fragment_test.go

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ func TestVintfManifestBuildAction(t *testing.T) { 


	testResult := PrepareForTestWithAndroidBuildComponents.RunTestWithBp(t, bp)



	vintfFragmentBuild := testResult.TestContext.ModuleForTests("test_vintf_fragment", "android_arm64_armv8-a").Rule("assemble_vintf")

	vintfFragmentBuild := testResult.TestContext.ModuleForTests("test_vintf_fragment", "android_common").Rule("assemble_vintf")

	if !strings.Contains(vintfFragmentBuild.RuleParams.Command, "assemble_vintf") {

		t.Errorf("Vintf_manifest build command does not process with assemble_vintf : " + vintfFragmentBuild.RuleParams.Command)

	}

genrule/genrule.go

+6 −0
Original line number Diff line number Diff line
@@ -645,6 +645,12 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	}



	g.setOutputFiles(ctx)



	if ctx.Os() == android.Windows {

		// Make doesn't support windows:

		// https://cs.android.com/android/platform/superproject/main/+/main:build/make/core/module_arch_supported.mk;l=66;drc=f264690860bb6ee7762784d6b7201aae057ba6f2

		g.HideFromMake()

	}

}



func (g *Module) setOutputFiles(ctx android.ModuleContext) {