Revert "Install transitive deps of jni libs, but not the jni libs themselves"
This reverts commit e7168070832a9a849007c9e63cd3cd827d1904e4.
Change-Id: If3b63706114cb534af359fdac2d80d8a5d02ea6d
diff --git a/java/app_test.go b/java/app_test.go
index d6ba0f1..92fe224 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -2043,44 +2043,6 @@
}
}
-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 {
diff --git a/java/java.go b/java/java.go
index fc7e5c5..0df96a3 100644
--- a/java/java.go
+++ b/java/java.go
@@ -368,17 +368,6 @@
static bool
}
-var _ android.SkipToTransitiveDepsTag = (*dependencyTag)(nil)
-
-func (depTag dependencyTag) SkipToTransitiveDeps() bool {
- // jni_libs are not installed because they are always embedded into the app. However,
- // transitive deps of jni_libs themselves should be installed along with the app.
- if IsJniDepTag(depTag) {
- return true
- }
- return false
-}
-
// installDependencyTag is a dependency tag that is annotated to cause the installed files of the
// dependency to be installed when the parent module is installed.
type installDependencyTag struct {