Merge "Do not propagate transitive required deps of apexes" into main am: f4fa5450f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3375510
Change-Id: I7f678eb347bebfd8a4bc12b167329bc8bcf8d3e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/apex/apex.go b/apex/apex.go
index 5f9f31e..f3b3d5b 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -607,9 +607,6 @@
}
ret.moduleDir = ctx.OtherModuleDir(module)
ret.partition = module.PartitionTag(ctx.DeviceConfig())
- ret.requiredModuleNames = module.RequiredModuleNames(ctx)
- ret.targetRequiredModuleNames = module.TargetRequiredModuleNames()
- ret.hostRequiredModuleNames = module.HostRequiredModuleNames()
ret.multilib = module.Target().Arch.ArchType.Multilib
}
return ret
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 7fb9b67..52d27e5 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -7937,46 +7937,6 @@
`)
}
-func TestCarryRequiredModuleNames(t *testing.T) {
- t.Parallel()
- ctx := testApex(t, `
- apex {
- name: "myapex",
- key: "myapex.key",
- native_shared_libs: ["mylib"],
- updatable: false,
- }
-
- apex_key {
- name: "myapex.key",
- public_key: "testkey.avbpubkey",
- private_key: "testkey.pem",
- }
-
- cc_library {
- name: "mylib",
- srcs: ["mylib.cpp"],
- system_shared_libs: [],
- stl: "none",
- required: ["a", "b"],
- host_required: ["c", "d"],
- target_required: ["e", "f"],
- apex_available: [ "myapex" ],
- }
- `)
-
- apexBundle := ctx.ModuleForTests("myapex", "android_common_myapex").Module().(*apexBundle)
- data := android.AndroidMkDataForTest(t, ctx, apexBundle)
- name := apexBundle.BaseModuleName()
- prefix := "TARGET_"
- var builder strings.Builder
- data.Custom(&builder, name, prefix, "", data)
- androidMk := builder.String()
- ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := mylib.myapex:64 a b\n")
- ensureContains(t, androidMk, "LOCAL_HOST_REQUIRED_MODULES := c d\n")
- ensureContains(t, androidMk, "LOCAL_TARGET_REQUIRED_MODULES := e f\n")
-}
-
func TestSymlinksFromApexToSystem(t *testing.T) {
t.Parallel()
bp := `