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

Commit 4384d294 authored by Jiyong Park's avatar Jiyong Park
Browse files

Add make java.dependencyTag installable or not 

java.dependencyTag now has a new field installable which contols whether
the dependency should be added as the install dep of the app or not.

This allows us to model all the dependency tags for Java using the same
struct.

Bug: N/A
Test: m
Change-Id: I9b1c7809a0bde3f15579aefd9bb34d828764b84b
parent 5f0943f3

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

}



// 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

var _ android.InstallNeededDependencyTag = (*dependencyTag)(nil)



func (d dependencyTag) InstallDepNeeded() bool {

	return d.installable

}



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

	return depTag == jniLibTag || depTag == jniInstallTag

}



var (
@@ -434,8 +434,8 @@ var ( 
	javaApiContributionTag  = dependencyTag{name: "java-api-contribution"}

	depApiSrcsTag           = dependencyTag{name: "dep-api-srcs"}

	aconfigDeclarationTag   = dependencyTag{name: "aconfig-declaration"}

	jniInstallTag           = installDependencyTag{name: "jni install"}

	binaryInstallTag        = installDependencyTag{name: "binary install"}

	jniInstallTag           = dependencyTag{name: "jni install", runtimeLinked: true, installable: true}

	binaryInstallTag        = dependencyTag{name: "binary install", runtimeLinked: true, installable: true}

	usesLibReqTag           = makeUsesLibraryDependencyTag(dexpreopt.AnySdkVersion, false)

	usesLibOptTag           = makeUsesLibraryDependencyTag(dexpreopt.AnySdkVersion, true)

	usesLibCompat28OptTag   = makeUsesLibraryDependencyTag(28, true)