Merge "Link type checking for java_library" (f3c24c12) · Commits · e / os / android_build_soong

java/app_test.go

+89 −0

Original line number	Diff line number	Diff line
		@@ -175,6 +175,95 @@ func TestPlatformAPIs(t *testing.T) {
		`)
		}

		func TestAndroidAppLinkType(t *testing.T) {
		testJava(t, `
		android_app {
		name: "foo",
		srcs: ["a.java"],
		libs: ["bar"],
		static_libs: ["baz"],
		platform_apis: true,
		}

		java_library {
		name: "bar",
		sdk_version: "current",
		srcs: ["b.java"],
		}

		android_library {
		name: "baz",
		sdk_version: "system_current",
		srcs: ["c.java"],
		}
		`)

		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.", `
		android_app {
		name: "foo",
		srcs: ["a.java"],
		libs: ["bar"],
		sdk_version: "current",
		static_libs: ["baz"],
		}

		java_library {
		name: "bar",
		sdk_version: "current",
		srcs: ["b.java"],
		}

		android_library {
		name: "baz",
		sdk_version: "system_current",
		srcs: ["c.java"],
		}
		`)

		testJava(t, `
		android_app {
		name: "foo",
		srcs: ["a.java"],
		libs: ["bar"],
		sdk_version: "system_current",
		static_libs: ["baz"],
		}

		java_library {
		name: "bar",
		sdk_version: "current",
		srcs: ["b.java"],
		}

		android_library {
		name: "baz",
		sdk_version: "system_current",
		srcs: ["c.java"],
		}
		`)

		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.", `
		android_app {
		name: "foo",
		srcs: ["a.java"],
		libs: ["bar"],
		sdk_version: "system_current",
		static_libs: ["baz"],
		}

		java_library {
		name: "bar",
		sdk_version: "current",
		srcs: ["b.java"],
		}

		android_library {
		name: "baz",
		srcs: ["c.java"],
		}
		`)
		}

		func TestResourceDirs(t *testing.T) {
		testCases := []struct {
		name string

java/java.go

+1 −2

Original line number	Diff line number	Diff line
		@@ -792,8 +792,7 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps {
		return
		}
		switch module.(type) {
		case *Library:
		case *AndroidLibrary:
		case Library, AndroidLibrary:
		if to, ok := module.(linkTypeContext); ok {
		switch tag {
		case bootClasspathTag, libTag, staticLibTag:

java/java_test.go

+88 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,94 @@ func moduleToPath(name string) string {
		}
		}

		func TestJavaLinkType(t *testing.T) {
		testJava(t, `
		java_library {
		name: "foo",
		srcs: ["a.java"],
		libs: ["bar"],
		static_libs: ["baz"],
		}

		java_library {
		name: "bar",
		sdk_version: "current",
		srcs: ["b.java"],
		}

		java_library {
		name: "baz",
		sdk_version: "system_current",
		srcs: ["c.java"],
		}
		`)

		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.", `
		java_library {
		name: "foo",
		srcs: ["a.java"],
		libs: ["bar"],
		sdk_version: "current",
		static_libs: ["baz"],
		}

		java_library {
		name: "bar",
		sdk_version: "current",
		srcs: ["b.java"],
		}

		java_library {
		name: "baz",
		sdk_version: "system_current",
		srcs: ["c.java"],
		}
		`)

		testJava(t, `
		java_library {
		name: "foo",
		srcs: ["a.java"],
		libs: ["bar"],
		sdk_version: "system_current",
		static_libs: ["baz"],
		}

		java_library {
		name: "bar",
		sdk_version: "current",
		srcs: ["b.java"],
		}

		java_library {
		name: "baz",
		sdk_version: "system_current",
		srcs: ["c.java"],
		}
		`)

		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.", `
		java_library {
		name: "foo",
		srcs: ["a.java"],
		libs: ["bar"],
		sdk_version: "system_current",
		static_libs: ["baz"],
		}

		java_library {
		name: "bar",
		sdk_version: "current",
		srcs: ["b.java"],
		}

		java_library {
		name: "baz",
		srcs: ["c.java"],
		}
		`)
		}

		func TestSimple(t *testing.T) {
		ctx, _ := testJava(t, `
		java_library {