diff options
| author | Jaewoong Jung <jungjw@google.com> | 2019-01-17 20:59:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-17 20:59:00 +0000 |
| commit | a4d4570e911d014cb5e20f0725c271dc626ae310 (patch) | |
| tree | 121b7254aa8688d5a1094bc5dd4fd3fddaaee688 /android | |
| parent | 24c4cd7aa32195a82913a347868ebf7e984bc9e7 (diff) | |
| parent | b9a11518bc6a47a9388a24a8d1b682b65d9bf378 (diff) | |
| download | build_soong-a4d4570e911d014cb5e20f0725c271dc626ae310.tar.gz build_soong-a4d4570e911d014cb5e20f0725c271dc626ae310.tar.bz2 build_soong-a4d4570e911d014cb5e20f0725c271dc626ae310.zip | |
Merge "Enable arch variant properties in prebuilt_etc."
Diffstat (limited to 'android')
| -rw-r--r-- | android/prebuilt_etc.go | 2 | ||||
| -rw-r--r-- | android/prebuilt_etc_test.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/android/prebuilt_etc.go b/android/prebuilt_etc.go index 40da653c..46d128eb 100644 --- a/android/prebuilt_etc.go +++ b/android/prebuilt_etc.go @@ -170,7 +170,7 @@ func PrebuiltEtcFactory() Module { module := &PrebuiltEtc{} InitPrebuiltEtcModule(module) // This module is device-only - InitAndroidArchModule(module, DeviceSupported, MultilibCommon) + InitAndroidArchModule(module, DeviceSupported, MultilibFirst) return module } diff --git a/android/prebuilt_etc_test.go b/android/prebuilt_etc_test.go index 27736ba5..8ab978b8 100644 --- a/android/prebuilt_etc_test.go +++ b/android/prebuilt_etc_test.go @@ -101,7 +101,7 @@ func TestPrebuiltEtcOutputPath(t *testing.T) { } `) - p := ctx.ModuleForTests("foo.conf", "android_common_core").Module().(*PrebuiltEtc) + p := ctx.ModuleForTests("foo.conf", "android_arm64_armv8-a_core").Module().(*PrebuiltEtc) if p.outputFilePath.Base() != "foo.installed.conf" { t.Errorf("expected foo.installed.conf, got %q", p.outputFilePath.Base()) } @@ -120,12 +120,12 @@ func TestPrebuiltEtcGlob(t *testing.T) { } `) - p := ctx.ModuleForTests("my_foo", "android_common_core").Module().(*PrebuiltEtc) + p := ctx.ModuleForTests("my_foo", "android_arm64_armv8-a_core").Module().(*PrebuiltEtc) if p.outputFilePath.Base() != "my_foo" { t.Errorf("expected my_foo, got %q", p.outputFilePath.Base()) } - p = ctx.ModuleForTests("my_bar", "android_common_core").Module().(*PrebuiltEtc) + p = ctx.ModuleForTests("my_bar", "android_arm64_armv8-a_core").Module().(*PrebuiltEtc) if p.outputFilePath.Base() != "bar.conf" { t.Errorf("expected bar.conf, got %q", p.outputFilePath.Base()) } |