diff options
| author | Colin Cross <ccross@android.com> | 2019-11-20 16:39:12 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-12-13 20:44:36 -0800 |
| commit | 7113d20774cd08b03fae4fb990bb15a791440152 (patch) | |
| tree | beea3fca19cbee0a6cd779823a74673672983b21 /xml | |
| parent | ac68248051e778708f665e16ed364103a6f9897c (diff) | |
| download | build_soong-7113d20774cd08b03fae4fb990bb15a791440152.tar.gz build_soong-7113d20774cd08b03fae4fb990bb15a791440152.tar.bz2 build_soong-7113d20774cd08b03fae4fb990bb15a791440152.zip | |
Use empty string for core image variant
Use the empty string for the core image variant so that modules
added to imageMutator do not change their build directory.
Bug: 142286466
Test: m checkbuild
Change-Id: Ida4534d9a4d6176236aaa480fed359ce27acfaa1
Merged-In: Ida4534d9a4d6176236aaa480fed359ce27acfaa1
(cherry picked from commit 72d685ee7f45e5393be44ae4159edf083ac918de)
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 f42ba776..0a115667 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_core").Rule(tc.rule) + rule := ctx.ModuleForTests(tc.input, "android_arm64_armv8-a").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_core").Module().(*prebuiltEtcXml) + m := ctx.ModuleForTests("foo.xml", "android_arm64_armv8-a").Module().(*prebuiltEtcXml) assertEqual(t, "installDir", buildDir+"/target/product/test_device/system/etc", m.InstallDirPath().String()) } |