diff options
| author | 2019-11-20 16:39:12 -0800 | |
|---|---|---|
| committer | 2019-12-13 20:44:36 -0800 | |
| commit | 7113d20774cd08b03fae4fb990bb15a791440152 (patch) | |
| tree | beea3fca19cbee0a6cd779823a74673672983b21 /cc/proto_test.go | |
| parent | ac68248051e778708f665e16ed364103a6f9897c (diff) | |
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 'cc/proto_test.go')
| -rw-r--r-- | cc/proto_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/proto_test.go b/cc/proto_test.go index 4f0de7801..f8bbd2643 100644 --- a/cc/proto_test.go +++ b/cc/proto_test.go @@ -29,7 +29,7 @@ func TestProto(t *testing.T) { srcs: ["a.proto"], }`) - proto := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_shared").Output("proto/a.pb.cc") + proto := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_shared").Output("proto/a.pb.cc") if cmd := proto.RuleParams.Command; !strings.Contains(cmd, "--cpp_out=") { t.Errorf("expected '--cpp_out' in %q", cmd) @@ -53,7 +53,7 @@ func TestProto(t *testing.T) { buildOS := android.BuildOs.String() - proto := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_shared").Output("proto/a.pb.cc") + proto := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_shared").Output("proto/a.pb.cc") foobar := ctx.ModuleForTests("protoc-gen-foobar", buildOS+"_x86_64") cmd := proto.RuleParams.Command |