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

Commit e63ab5ea authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "java link time error improve"

parents 7a64f7e5 0029898a

java/app_test.go

+2 −2
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ func TestAndroidAppLinkType(t *testing.T) { 
		}

	`)



	testJavaError(t, "Adjust sdk_version: property of the source or target module so that target module is built with the same or smaller API set than the source.", `

	testJavaError(t, "consider adjusting sdk_version: OR platform_apis:", `

		android_app {

			name: "foo",

			srcs: ["a.java"],
@@ -335,7 +335,7 @@ func TestAndroidAppLinkType(t *testing.T) { 
		}

	`)



	testJavaError(t, "Adjust sdk_version: property of the source or target module so that target module is built with the same or smaller API set than the source.", `

	testJavaError(t, "consider adjusting sdk_version: OR platform_apis:", `

		android_app {

			name: "foo",

			srcs: ["a.java"],

java/java.go

+3 −1
Original line number Diff line number Diff line
@@ -952,7 +952,9 @@ func checkLinkType(ctx android.ModuleContext, from *Module, to linkTypeContext, 
		return

	}

	otherLinkType, _ := to.getLinkType(ctx.OtherModuleName(to))

	commonMessage := "Adjust sdk_version: property of the source or target module so that target module is built with the same or smaller API set than the source."

	commonMessage := " In order to fix this, consider adjusting sdk_version: OR platform_apis: " +

		"property of the source or target module so that target module is built with the same " +

		"or smaller API set when compared to the source."



	switch myLinkType {

	case javaCore:

java/java_test.go

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ func TestJavaLinkType(t *testing.T) { 
		}

	`)



	testJavaError(t, "Adjust sdk_version: property of the source or target module so that target module is built with the same or smaller API set than the source.", `

	testJavaError(t, "consider adjusting sdk_version: OR platform_apis:", `

		java_library {

			name: "foo",

			srcs: ["a.java"],
@@ -246,7 +246,7 @@ func TestJavaLinkType(t *testing.T) { 
		}

	`)



	testJavaError(t, "Adjust sdk_version: property of the source or target module so that target module is built with the same or smaller API set than the source.", `

	testJavaError(t, "consider adjusting sdk_version: OR platform_apis:", `

		java_library {

			name: "foo",

			srcs: ["a.java"],