Do not propagate transitive required deps of apexes
This reverts this feature which was added for kati packaging system in
https://r.android.com/1199365. The equivalent feature will not be added
to soong packaging system. To prevent installation discrepancies creep
between soong and kati packaging systems, this feature will be removed
from kati packaging system as well.
Test: No diff in file_list.txt of system for aosp_cf_x86_64_phone
Test: presubmits
Bug: 376110962
Change-Id: I34ce9421c232063e46cfbf6f248c54f1ca97ed18
diff --git a/apex/apex.go b/apex/apex.go
index 0e40d7c..6611fbf 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -614,9 +614,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 6e92959..423288a 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -7938,46 +7938,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 := `