diff options
| author | Colin Cross <ccross@android.com> | 2020-11-17 06:32:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-17 06:32:57 +0000 |
| commit | e3d308b5a51b16fa951efe2a0fdbc392624c58f4 (patch) | |
| tree | 620640192be224d3f081b58f427f0e9d38ddf6c0 /java/java.go | |
| parent | 0a829f2a0aaa7938f657254c2507695db56e5689 (diff) | |
| parent | b5ae193b8f01f396168fa30bf9163c31337c502b (diff) | |
Merge "Revert "Annotate dependency tags for dependencies of installed files""
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/java/java.go b/java/java.go index d04968510..d6dc148a6 100644 --- a/java/java.go +++ b/java/java.go @@ -547,14 +547,6 @@ type dependencyTag struct { name string } -// 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 { - blueprint.BaseDependencyTag - android.InstallAlwaysNeededDependencyTag - name string -} - type usesLibraryDependencyTag struct { dependencyTag sdkVersion int // SDK version in which the library appared as a standalone library. @@ -588,8 +580,6 @@ var ( instrumentationForTag = dependencyTag{name: "instrumentation_for"} extraLintCheckTag = dependencyTag{name: "extra-lint-check"} jniLibTag = dependencyTag{name: "jnilib"} - jniInstallTag = installDependencyTag{name: "jni install"} - binaryInstallTag = installDependencyTag{name: "binary install"} usesLibTag = makeUsesLibraryDependencyTag(dexpreopt.AnySdkVersion) usesLibCompat28Tag = makeUsesLibraryDependencyTag(28) usesLibCompat29Tag = makeUsesLibraryDependencyTag(29) @@ -2560,12 +2550,9 @@ func (j *Binary) DepsMutator(ctx android.BottomUpMutatorContext) { if ctx.Arch().ArchType == android.Common { j.deps(ctx) } else { - // These dependencies ensure the host installation rules will install the jar file and - // the jni libraries when the wrapper is installed. - ctx.AddVariationDependencies(nil, jniInstallTag, j.binaryProperties.Jni_libs...) - ctx.AddVariationDependencies( - []blueprint.Variation{{Mutator: "arch", Variation: android.CommonArch.String()}}, - binaryInstallTag, ctx.ModuleName()) + // This dependency ensures the host installation rules will install the jni libraries + // when the wrapper is installed. + ctx.AddVariationDependencies(nil, jniLibTag, j.binaryProperties.Jni_libs...) } } |