diff options
| -rw-r--r-- | android/vintf_fragment.go | 2 | ||||
| -rw-r--r-- | android/vintf_fragment_test.go | 2 | ||||
| -rw-r--r-- | genrule/genrule.go | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/android/vintf_fragment.go b/android/vintf_fragment.go index 329eac974..42eaaf01a 100644 --- a/android/vintf_fragment.go +++ b/android/vintf_fragment.go @@ -44,7 +44,7 @@ func vintfLibraryFactory() Module { m.AddProperties( &m.properties, ) - InitAndroidArchModule(m, DeviceSupported, MultilibFirst) + InitAndroidArchModule(m, DeviceSupported, MultilibCommon) return m } diff --git a/android/vintf_fragment_test.go b/android/vintf_fragment_test.go index 8be534cf4..cd90b986c 100644 --- a/android/vintf_fragment_test.go +++ b/android/vintf_fragment_test.go @@ -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) } diff --git a/genrule/genrule.go b/genrule/genrule.go index c029167d0..349615f7e 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -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) { |