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

Commit fb04df4d authored by Bill Peckham's avatar Bill Peckham
Browse files

Supply LOCAL_SOONG_DEX_JAR for java_import with compile_dex. 

Without LOCAL_SOONG_DEX_JAR, ninja fails with a missing
dependency error.

Test: m nothing
Test: new TestImportSoongDexJar
Bug: 173705556
Change-Id: I54a4c6ea93877667a3fb97f8b2621c42e431f577
parent a41a6963

java/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -196,6 +196,9 @@ func (prebuilt *Import) AndroidMkEntries() []android.AndroidMkEntries { 
		ExtraEntries: []android.AndroidMkExtraEntriesFunc{

			func(entries *android.AndroidMkEntries) {

				entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", !Bool(prebuilt.properties.Installable))

				if prebuilt.dexJarFile != nil {

					entries.SetPath("LOCAL_SOONG_DEX_JAR", prebuilt.dexJarFile)

				}

				entries.SetPath("LOCAL_SOONG_HEADER_JAR", prebuilt.combinedClasspathFile)

				entries.SetPath("LOCAL_SOONG_CLASSES_JAR", prebuilt.combinedClasspathFile)

				entries.SetString("LOCAL_SDK_VERSION", prebuilt.makeSdkVersion())

java/androidmk_test.go

+22 −0
Original line number Diff line number Diff line
@@ -166,3 +166,25 @@ func TestJavaSdkLibrary_RequireXmlPermissionFile(t *testing.T) { 
		}

	}

}



func TestImportSoongDexJar(t *testing.T) {

	ctx, config := testJava(t, `

		java_import {

			name: "my-java-import",

			jars: ["a.jar"],

			prefer: true,

			compile_dex: true,

		}

	`)



	mod := ctx.ModuleForTests("my-java-import", "android_common").Module()

	entries := android.AndroidMkEntriesForTest(t, config, "", mod)[0]

	expectedSoongDexJar := buildDir + "/.intermediates/my-java-import/android_common/dex/my-java-import.jar"

	actualSoongDexJar := entries.EntryMap["LOCAL_SOONG_DEX_JAR"]



	if len(actualSoongDexJar) != 1 {

		t.Errorf("LOCAL_SOONG_DEX_JAR incorrect len %d", len(actualSoongDexJar))

	} else if actualSoongDexJar[0] != expectedSoongDexJar {

		t.Errorf("LOCAL_SOONG_DEX_JAR mismatch, actual: %s, expected: %s", actualSoongDexJar[0], expectedSoongDexJar)

	}

}