StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable arch variant properties in prebuilt_etc."

Browse Source
This commit is contained in:
Jaewoong Jung
2019-01-17 20:59:00 +00:00
committed by Gerrit Code Review
parent 24c4cd7aa3 b9a11518bc
commit a4d4570e91
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/prebuilt_etc.go
View File

@@ -170,7 +170,7 @@ func PrebuiltEtcFactory() Module {
module := &PrebuiltEtc{} module := &PrebuiltEtc{}
InitPrebuiltEtcModule(module) InitPrebuiltEtcModule(module)
// This module is device-only // This module is device-only
InitAndroidArchModule(module, DeviceSupported, MultilibCommon) InitAndroidArchModule(module, DeviceSupported, MultilibFirst)
return module return module
} }

6
android/prebuilt_etc_test.go
View File

@@ -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" { if p.outputFilePath.Base() != "foo.installed.conf" {
t.Errorf("expected foo.installed.conf, got %q", p.outputFilePath.Base()) 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" { if p.outputFilePath.Base() != "my_foo" {
t.Errorf("expected my_foo, got %q", p.outputFilePath.Base()) 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" { if p.outputFilePath.Base() != "bar.conf" {
t.Errorf("expected bar.conf, got %q", p.outputFilePath.Base()) t.Errorf("expected bar.conf, got %q", p.outputFilePath.Base())
} }

9
apex/apex.go
View File

@@ -409,6 +409,11 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
a.properties.Multilib.First.Native_shared_libs, a.properties.Multilib.First.Native_shared_libs,
a.properties.Multilib.First.Binaries, target.String(), a.properties.Multilib.First.Binaries, target.String(),
a.getImageVariation(config)) a.getImageVariation(config))
// When multilib.* is omitted for prebuilts, it implies multilib.first.
ctx.AddFarVariationDependencies([]blueprint.Variation{
{Mutator: "arch", Variation: target.String()},
}, prebuiltTag, a.properties.Prebuilts...)
} }
switch target.Arch.ArchType.Multilib { switch target.Arch.ArchType.Multilib {
@@ -444,10 +449,6 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
{Mutator: "arch", Variation: "android_common"}, {Mutator: "arch", Variation: "android_common"},
}, javaLibTag, a.properties.Java_libs...) }, javaLibTag, a.properties.Java_libs...)
ctx.AddFarVariationDependencies([]blueprint.Variation{
{Mutator: "arch", Variation: "android_common"},
}, prebuiltTag, a.properties.Prebuilts...)
if !ctx.Config().FlattenApex() || ctx.Config().UnbundledBuild() { if !ctx.Config().FlattenApex() || ctx.Config().UnbundledBuild() {
if String(a.properties.Key) == "" { if String(a.properties.Key) == "" {
ctx.ModuleErrorf("key is missing") ctx.ModuleErrorf("key is missing")

2
java/java_test.go
View File

@@ -861,7 +861,7 @@ func TestJavaSdkLibrary(t *testing.T) {
ctx.ModuleForTests("foo"+sdkDocsSuffix, "android_common") ctx.ModuleForTests("foo"+sdkDocsSuffix, "android_common")
ctx.ModuleForTests("foo"+sdkDocsSuffix+sdkSystemApiSuffix, "android_common") ctx.ModuleForTests("foo"+sdkDocsSuffix+sdkSystemApiSuffix, "android_common")
ctx.ModuleForTests("foo"+sdkDocsSuffix+sdkTestApiSuffix, "android_common") ctx.ModuleForTests("foo"+sdkDocsSuffix+sdkTestApiSuffix, "android_common")
ctx.ModuleForTests("foo"+sdkXmlFileSuffix, "android_common") ctx.ModuleForTests("foo"+sdkXmlFileSuffix, "android_arm64_armv8-a")
ctx.ModuleForTests("foo.api.public.28", "") ctx.ModuleForTests("foo.api.public.28", "")
ctx.ModuleForTests("foo.api.system.28", "") ctx.ModuleForTests("foo.api.system.28", "")
ctx.ModuleForTests("foo.api.test.28", "") ctx.ModuleForTests("foo.api.test.28", "")