diff options
| author | 2019-11-20 13:35:50 -0800 | |
|---|---|---|
| committer | 2019-12-06 12:37:14 -0800 | |
| commit | ae6c5207cc5faddcdbb480e5a58773e278fddebc (patch) | |
| tree | 73ea1f0896c45fab8750e5b838e543da6de877b4 /xml | |
| parent | f3c24c12efff1a6b8307eeea460310afbc80e131 (diff) | |
Move ImageMutator after archMutator
Move the ImageMutator to be registered just after the archMutator
in preparation for moving it between osMutator and archMutator.
Requries updating variants in a few tests that now run the
ImageMutator.
Bug: 142286466
Test: no change to build.ninja
Test: all soong tests
Change-Id: Ia9d2a7bc0e225bedec3c9a83ea04f471a931bf47
Diffstat (limited to 'xml')
| -rw-r--r-- | xml/xml_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xml/xml_test.go b/xml/xml_test.go index 0a1156670..f42ba7762 100644 --- a/xml/xml_test.go +++ b/xml/xml_test.go @@ -104,7 +104,7 @@ func TestPrebuiltEtcXml(t *testing.T) { {rule: "xmllint-minimal", input: "baz.xml"}, } { t.Run(tc.schemaType, func(t *testing.T) { - rule := ctx.ModuleForTests(tc.input, "android_arm64_armv8-a").Rule(tc.rule) + rule := ctx.ModuleForTests(tc.input, "android_arm64_armv8-a_core").Rule(tc.rule) assertEqual(t, "input", tc.input, rule.Input.String()) if tc.schemaType != "" { assertEqual(t, "schema", tc.schema, rule.Args[tc.schemaType]) @@ -112,6 +112,6 @@ func TestPrebuiltEtcXml(t *testing.T) { }) } - m := ctx.ModuleForTests("foo.xml", "android_arm64_armv8-a").Module().(*prebuiltEtcXml) + m := ctx.ModuleForTests("foo.xml", "android_arm64_armv8-a_core").Module().(*prebuiltEtcXml) assertEqual(t, "installDir", buildDir+"/target/product/test_device/system/etc", m.InstallDirPath().String()) } |