diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/java/java.go b/java/java.go index bc5bdb192..59ec94d5b 100644 --- a/java/java.go +++ b/java/java.go @@ -29,7 +29,6 @@ import ( "github.com/google/blueprint/proptools" "android/soong/android" - "android/soong/cc" "android/soong/dexpreopt" "android/soong/java/config" "android/soong/tradefed" @@ -2388,9 +2387,6 @@ type testProperties struct { // Test options. Test_options TestOptions - - // Names of modules containing JNI libraries that should be installed alongside the test. - Jni_libs []string } type hostTestProperties struct { @@ -2452,13 +2448,6 @@ func (j *TestHost) DepsMutator(ctx android.BottomUpMutatorContext) { } } - if len(j.testProperties.Jni_libs) > 0 { - for _, target := range ctx.MultiTargets() { - sharedLibVariations := append(target.Variations(), blueprint.Variation{Mutator: "link", Variation: "shared"}) - ctx.AddFarVariationDependencies(sharedLibVariations, jniLibTag, j.testProperties.Jni_libs...) - } - } - j.deps(ctx) } @@ -2474,29 +2463,6 @@ func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.data = append(j.data, android.OutputFileForModule(ctx, dep, "")) }) - ctx.VisitDirectDepsWithTag(jniLibTag, func(dep android.Module) { - sharedLibInfo := ctx.OtherModuleProvider(dep, cc.SharedLibraryInfoProvider).(cc.SharedLibraryInfo) - if sharedLibInfo.SharedLibrary != nil { - // Copy to an intermediate output directory to append "lib[64]" to the path, - // so that it's compatible with the default rpath values. - var relPath string - if sharedLibInfo.Target.Arch.ArchType.Multilib == "lib64" { - relPath = filepath.Join("lib64", sharedLibInfo.SharedLibrary.Base()) - } else { - relPath = filepath.Join("lib", sharedLibInfo.SharedLibrary.Base()) - } - relocatedLib := android.PathForModuleOut(ctx, "relocated").Join(ctx, relPath) - ctx.Build(pctx, android.BuildParams{ - Rule: android.Cp, - Input: sharedLibInfo.SharedLibrary, - Output: relocatedLib, - }) - j.data = append(j.data, relocatedLib) - } else { - ctx.PropertyErrorf("jni_libs", "%q of type %q is not supported", dep.Name(), ctx.OtherModuleType(dep)) - } - }) - j.Library.GenerateAndroidBuildActions(ctx) } |