Revert "Allow dependencies from platform variants to APEX modules."
Revert submission 1658000 Reason for revert: Breaks full-eng build: b/184239856 Reverted Changes: I4f8ead785:Avoid internal APEX stubs for libsigchain and clea... I68affdf69:Allow dependencies from platform variants to APEX ... I54b33784e:Rename libdexfile_external_static to libdexfile_st... Id68ae9438:libdexfile_external is being replaced by libdexfil... I12ac84eb4:libdexfile_external is replaced by libdexfile. If05dbffc8:Rename libdexfile_external_static to libdexfile_st... Ia011fa3a8:Merge libdexfile_external into libdexfile. Change-Id: If494dc5385042a4620a76a9eadc1613ae0eb1655
This commit is contained in:
@@ -6936,56 +6936,6 @@ func TestIndirectTestFor(t *testing.T) {
|
||||
ensureLinkedLibIs("myprivlib", "android_arm64_armv8-a_shared", "out/soong/.intermediates/mylib/", "android_arm64_armv8-a_shared/mylib.so")
|
||||
}
|
||||
|
||||
func TestTestForForLibInOtherApex(t *testing.T) {
|
||||
// This case is only allowed for known overlapping APEXes, i.e. the ART APEXes.
|
||||
_ = testApex(t, `
|
||||
apex {
|
||||
name: "com.android.art",
|
||||
key: "myapex.key",
|
||||
native_shared_libs: ["mylib"],
|
||||
updatable: false,
|
||||
}
|
||||
|
||||
apex {
|
||||
name: "com.android.art.debug",
|
||||
key: "myapex.key",
|
||||
native_shared_libs: ["mylib", "mytestlib"],
|
||||
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",
|
||||
stubs: {
|
||||
versions: ["1"],
|
||||
},
|
||||
apex_available: ["com.android.art", "com.android.art.debug"],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "mytestlib",
|
||||
srcs: ["mylib.cpp"],
|
||||
system_shared_libs: [],
|
||||
shared_libs: ["mylib"],
|
||||
stl: "none",
|
||||
apex_available: ["com.android.art.debug"],
|
||||
test_for: ["com.android.art"],
|
||||
}
|
||||
`,
|
||||
android.MockFS{
|
||||
"system/sepolicy/apex/com.android.art-file_contexts": nil,
|
||||
"system/sepolicy/apex/com.android.art.debug-file_contexts": nil,
|
||||
}.AddToFixture())
|
||||
}
|
||||
|
||||
// TODO(jungjw): Move this to proptools
|
||||
func intPtr(i int) *int {
|
||||
return &i
|
||||
|
Reference in New Issue
Block a user