diff options
| author | Yu Shan <shanyu@google.com> | 2024-05-17 20:09:23 +0000 |
|---|---|---|
| committer | Yu Shan <shanyu@google.com> | 2024-05-17 13:37:20 -0700 |
| commit | f14b5ba86388b97a482ab02d7c18a07f22e51c5d (patch) | |
| tree | f21c92ad8589cc237a4dcac28a572e08015ff755 | |
| parent | 562d9054e52fb776ff6dde92fc280acc344e6f31 (diff) | |
| download | soong-f14b5ba86388b97a482ab02d7c18a07f22e51c5d.tar.gz | |
Revert "Add make java.dependencyTag installable or not"
Revert submission 3088867
Reason for revert: On cf_auto build, we are seeing a symlink of jni lib pointing to lib64/libcarservicejni.so, which does not exist on the device.
Reverted changes: /q/submissionid:3088867
Bug: b/341335305
Change-Id: I60052dbb004df58fdfaf93be6089769ab2a670fc
| -rw-r--r-- | java/java.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/java/java.go b/java/java.go index 05ef5d04f..249480428 100644 --- a/java/java.go +++ b/java/java.go @@ -366,14 +366,14 @@ type dependencyTag struct { toolchain bool static bool - - installable bool } -var _ android.InstallNeededDependencyTag = (*dependencyTag)(nil) - -func (d dependencyTag) InstallDepNeeded() bool { - return d.installable +// 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 } func (d dependencyTag) LicenseAnnotations() []android.LicenseAnnotation { @@ -405,7 +405,7 @@ func makeUsesLibraryDependencyTag(sdkVersion int, optional bool) usesLibraryDepe } func IsJniDepTag(depTag blueprint.DependencyTag) bool { - return depTag == jniLibTag || depTag == jniInstallTag + return depTag == jniLibTag } var ( @@ -434,8 +434,8 @@ var ( javaApiContributionTag = dependencyTag{name: "java-api-contribution"} depApiSrcsTag = dependencyTag{name: "dep-api-srcs"} aconfigDeclarationTag = dependencyTag{name: "aconfig-declaration"} - jniInstallTag = dependencyTag{name: "jni install", runtimeLinked: true, installable: true} - binaryInstallTag = dependencyTag{name: "binary install", runtimeLinked: true, installable: true} + jniInstallTag = installDependencyTag{name: "jni install"} + binaryInstallTag = installDependencyTag{name: "binary install"} usesLibReqTag = makeUsesLibraryDependencyTag(dexpreopt.AnySdkVersion, false) usesLibOptTag = makeUsesLibraryDependencyTag(dexpreopt.AnySdkVersion, true) usesLibCompat28OptTag = makeUsesLibraryDependencyTag(28, true) |