Revert "Install transitive deps of jni libs, but not the jni libs themselves"
This reverts commit e716807083
.
Change-Id: If3b63706114cb534af359fdac2d80d8a5d02ea6d
This commit is contained in:
@@ -2043,44 +2043,6 @@ func TestJNIPackaging(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestJNITranstiveDepsInstallation(t *testing.T) {
|
||||
ctx, _ := testJava(t, cc.GatherRequiredDepsForTest(android.Android)+`
|
||||
android_app {
|
||||
name: "app",
|
||||
jni_libs: ["libjni"],
|
||||
platform_apis: true,
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libjni",
|
||||
shared_libs: ["libplatform"],
|
||||
system_shared_libs: [],
|
||||
stl: "none",
|
||||
required: ["librequired"],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libplatform",
|
||||
system_shared_libs: [],
|
||||
stl: "none",
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "librequired",
|
||||
system_shared_libs: [],
|
||||
stl: "none",
|
||||
}
|
||||
|
||||
`)
|
||||
|
||||
app := ctx.ModuleForTests("app", "android_common")
|
||||
jniLibZip := app.Output("jnilibs.zip")
|
||||
android.AssertPathsEndWith(t, "embedd jni lib mismatch", []string{"libjni.so"}, jniLibZip.Implicits)
|
||||
|
||||
install := app.Rule("Cp")
|
||||
android.AssertPathsEndWith(t, "install dep mismatch", []string{"libplatform.so", "librequired.so"}, install.OrderOnly)
|
||||
}
|
||||
|
||||
func TestJNISDK(t *testing.T) {
|
||||
ctx, _ := testJava(t, cc.GatherRequiredDepsForTest(android.Android)+`
|
||||
cc_library {
|
||||
|
Reference in New Issue
Block a user