Merge "Don't expect depfile from .s files"
diff --git a/android/apex.go b/android/apex.go
index d1fb6f4..8d99d56 100644
--- a/android/apex.go
+++ b/android/apex.go
@@ -122,15 +122,13 @@
func (m *ApexModuleBase) CreateApexVariations(mctx BottomUpMutatorContext) []blueprint.Module {
if len(m.apexVariations) > 0 {
- // The original module is mutated into "platform" variation.
- variations := []string{"platform"}
- for _, a := range m.apexVariations {
- variations = append(variations, a)
- }
+ variations := []string{""} // Original variation for platform
+ variations = append(variations, m.apexVariations...)
+
modules := mctx.CreateVariations(variations...)
for i, m := range modules {
if i == 0 {
- continue // platform
+ continue
}
m.(ApexModule).setApexName(variations[i])
}
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 63d2aab..f8f9b33 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -227,6 +227,10 @@
// Ensure that both direct and indirect deps are copied into apex
ensureContains(t, copyCmds, "image.apex/lib64/mylib.so")
ensureContains(t, copyCmds, "image.apex/lib64/mylib2.so")
+
+ // Ensure that the platform variant ends with _core_shared
+ ensureListContains(t, ctx.ModuleVariantsForTests("mylib"), "android_arm64_armv8-a_core_shared")
+ ensureListContains(t, ctx.ModuleVariantsForTests("mylib2"), "android_arm64_armv8-a_core_shared")
}
func TestBasicZipApex(t *testing.T) {
@@ -664,5 +668,5 @@
ldFlags := ctx.ModuleForTests("not_in_apex", "android_arm64_armv8-a_core").Rule("ld").Args["libFlags"]
// Ensure that not_in_apex is linking with the static variant of mylib
- ensureContains(t, ldFlags, "mylib/android_arm64_armv8-a_core_static_platform/mylib.a")
+ ensureContains(t, ldFlags, "mylib/android_arm64_armv8-a_core_static/mylib.a")
}
diff --git a/cc/cc.go b/cc/cc.go
index c3e554c..ce28a3b 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -634,6 +634,10 @@
// Host modules do not need ABI dumps.
return false
}
+ if !ctx.mod.IsForPlatform() {
+ // APEX variants do not need ABI dumps.
+ return false
+ }
if inList(ctx.baseModuleName(), llndkLibraries) {
return true
}