Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f14b5ba8 authored by Yu Shan's avatar Yu Shan
Browse files

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
parent 562d9054

java/java.go

+9 −9
Original line number Diff line number Diff line
@@ -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)