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

Commit 25857f5f authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Rename output stubs jar file in java_api_library 

When generating framework.aidl, `android_*_stubs_current` are converted
to .aidl files (and created as targets) by replacing the extension from
`.jar` to `.aidl`.
Thus, when replacing `android_*_stubs_current` to java_api_library
modules, generating `android.jar` files leads to ninja error(multiple
rules for generating */android.aidl error).
Prevent this error by renaming the name of the artifact jar file as the
module name so that distinct-named ninja targets can be created.

Test: m
Change-Id: Iaa7248996d7bf5e7f98e1d1e2919870c3cccf5a6
parent 7ba7b46f

java/java.go

+1 −1
Original line number Diff line number Diff line
@@ -1782,7 +1782,7 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { 


	rule.Build("metalava", "metalava merged")

	compiledStubs := android.PathForModuleOut(ctx, ctx.ModuleName(), "stubs.jar")

	al.stubsJar = android.PathForModuleOut(ctx, ctx.ModuleName(), "android.jar")

	al.stubsJar = android.PathForModuleOut(ctx, ctx.ModuleName(), fmt.Sprintf("%s.jar", ctx.ModuleName()))



	var flags javaBuilderFlags

	flags.javaVersion = getStubsJavaVersion()

java/java_test.go

+4 −4
Original line number Diff line number Diff line
@@ -2037,11 +2037,11 @@ func TestJavaApiLibraryJarGeneration(t *testing.T) { 
	}{

		{

			moduleName:    "bar1",

			outputJarName: "bar1/android.jar",

			outputJarName: "bar1/bar1.jar",

		},

		{

			moduleName:    "bar2",

			outputJarName: "bar2/android.jar",

			outputJarName: "bar2/bar2.jar",

		},

	}

	for _, c := range testcases {
@@ -2113,7 +2113,7 @@ func TestJavaApiLibraryLibsLink(t *testing.T) { 
		},

		{

			moduleName:        "bar2",

			classPathJarNames: []string{"lib1.jar", "lib2.jar", "bar1/android.jar"},

			classPathJarNames: []string{"lib1.jar", "lib2.jar", "bar1/bar1.jar"},

		},

	}

	for _, c := range testcases {
@@ -2188,7 +2188,7 @@ func TestJavaApiLibraryStaticLibsLink(t *testing.T) { 
		},

		{

			moduleName:        "bar2",

			staticLibJarNames: []string{"lib1.jar", "lib2.jar", "bar1/android.jar"},

			staticLibJarNames: []string{"lib1.jar", "lib2.jar", "bar1/bar1.jar"},

		},

	}

	for _, c := range testcases {