diff options
Diffstat (limited to 'java')
| -rwxr-xr-x | java/app.go | 42 | ||||
| -rw-r--r-- | java/app_builder.go | 6 | ||||
| -rw-r--r-- | java/app_test.go | 38 | ||||
| -rw-r--r-- | java/java.go | 1 |
4 files changed, 20 insertions, 67 deletions
diff --git a/java/app.go b/java/app.go index aa9c78c0f..7595e36a6 100755 --- a/java/app.go +++ b/java/app.go @@ -167,11 +167,18 @@ func (a *AndroidApp) DepsMutator(ctx android.BottomUpMutatorContext) { a.aapt.deps(ctx, sdkDep) } - tag := &jniDependencyTag{} for _, jniTarget := range ctx.MultiTargets() { variation := append(jniTarget.Variations(), blueprint.Variation{Mutator: "link", Variation: "shared"}) + tag := &jniDependencyTag{ + target: jniTarget, + } ctx.AddFarVariationDependencies(variation, tag, a.appProperties.Jni_libs...) + if String(a.appProperties.Stl) == "c++_shared" { + if a.shouldEmbedJnis(ctx) { + ctx.AddFarVariationDependencies(variation, tag, "ndk_libc++_shared") + } + } } a.usesLibrary.deps(ctx, sdkDep.hasFrameworkLibs()) @@ -464,7 +471,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { dexJarFile := a.dexBuildActions(ctx) - jniLibs, certificateDeps := collectAppDeps(ctx, a.shouldEmbedJnis(ctx)) + jniLibs, certificateDeps := collectAppDeps(ctx) jniJarFile := a.jniBuildActions(jniLibs, ctx) if ctx.Failed() { @@ -500,33 +507,22 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { } } -func collectAppDeps(ctx android.ModuleContext, shouldCollectRecursiveNativeDeps bool) ([]jniLib, []Certificate) { +func collectAppDeps(ctx android.ModuleContext) ([]jniLib, []Certificate) { var jniLibs []jniLib var certificates []Certificate - seenModulePaths := make(map[string]bool) - ctx.WalkDeps(func(module android.Module, parent android.Module) bool { + ctx.VisitDirectDeps(func(module android.Module) { otherName := ctx.OtherModuleName(module) tag := ctx.OtherModuleDependencyTag(module) - if IsJniDepTag(tag) || tag == cc.SharedDepTag { + if jniTag, ok := tag.(*jniDependencyTag); ok { if dep, ok := module.(*cc.Module); ok { - if dep.IsLlndk(ctx.Config()) || dep.IsStubs() { - return false - } - lib := dep.OutputFile() - path := lib.Path() - if seenModulePaths[path.String()] { - return false - } - seenModulePaths[path.String()] = true - if lib.Valid() { jniLibs = append(jniLibs, jniLib{ name: ctx.OtherModuleName(module), - path: path, - target: module.Target(), + path: lib.Path(), + target: jniTag.target, }) } else { ctx.ModuleErrorf("dependency %q missing output file", otherName) @@ -534,19 +530,13 @@ func collectAppDeps(ctx android.ModuleContext, shouldCollectRecursiveNativeDeps } else { ctx.ModuleErrorf("jni_libs dependency %q must be a cc library", otherName) } - - return shouldCollectRecursiveNativeDeps - } - - if tag == certificateTag { + } else if tag == certificateTag { if dep, ok := module.(*AndroidAppCertificate); ok { certificates = append(certificates, dep.Certificate) } else { ctx.ModuleErrorf("certificate dependency %q must be an android_app_certificate module", otherName) } } - - return false }) return jniLibs, certificates @@ -978,7 +968,7 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext ctx.ModuleErrorf("One and only one of certficate, presigned, and default_dev_cert properties must be set") } - _, certificates := collectAppDeps(ctx, false) + _, certificates := collectAppDeps(ctx) // TODO: LOCAL_EXTRACT_APK/LOCAL_EXTRACT_DPI_APK // TODO: LOCAL_PACKAGE_SPLITS diff --git a/java/app_builder.go b/java/app_builder.go index 5e7fbe6de..ec2f6dafe 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -200,14 +200,14 @@ func TransformJniLibsToJar(ctx android.ModuleContext, outputFile android.Writabl } if uncompressJNI { - jarArgs = append(jarArgs, "-L", "0") + jarArgs = append(jarArgs, "-L 0") } for _, j := range jniLibs { deps = append(deps, j.path) jarArgs = append(jarArgs, - "-P", targetToJniDir(j.target), - "-f", j.path.String()) + "-P "+targetToJniDir(j.target), + "-f "+j.path.String()) } ctx.Build(pctx, android.BuildParams{ diff --git a/java/app_test.go b/java/app_test.go index 5cf0ba78d..1800bb73b 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -1631,45 +1631,7 @@ func TestAndroidTestImport(t *testing.T) { func TestStl(t *testing.T) { ctx, _ := testJava(t, cc.GatherRequiredDepsForTest(android.Android)+` cc_library { - name: "ndk_libunwind", - sdk_version: "current", - stl: "none", - system_shared_libs: [], - } - - cc_library { - name: "libc.ndk.current", - sdk_version: "current", - stl: "none", - system_shared_libs: [], - } - - cc_library { - name: "libm.ndk.current", - sdk_version: "current", - stl: "none", - system_shared_libs: [], - } - - cc_library { - name: "libdl.ndk.current", - sdk_version: "current", - stl: "none", - system_shared_libs: [], - } - - cc_object { - name: "ndk_crtbegin_so.27", - } - - cc_object { - name: "ndk_crtend_so.27", - } - - cc_library { name: "libjni", - sdk_version: "current", - stl: "c++_shared", } android_test { diff --git a/java/java.go b/java/java.go index cdae282bb..d8db5f8a4 100644 --- a/java/java.go +++ b/java/java.go @@ -466,6 +466,7 @@ type dependencyTag struct { type jniDependencyTag struct { blueprint.BaseDependencyTag + target android.Target } func IsJniDepTag(depTag blueprint.DependencyTag) bool { |