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

Commit fd53e210 authored by Paul Duffin's avatar Paul Duffin
Browse files

Copy implementation and header jars to make when possible 

Fixes test issues caused by a jar containing a classes.dex file was
copied to a place that was expected a jar containing class files.

Bug: 191360201
Test: - in master-art
      find out/ -name \*core-icu4j\* | xargs rm -fr
      art/tools/buildbot-build.sh --target --installclean
      art/tools/bootjars.sh --path --core
      - examine file output from previous script for core-icu4j,
        before this change it contained classes.dex file after this
        change it contained *.class files.
Merged-In: I05ecf652535ec097125fb76d6ca80fee6587f98d
Change-Id: I05ecf652535ec097125fb76d6ca80fee6587f98d
(cherry picked from commit 85fa344d)
parent c30aea20

apex/prebuilt.go

+11 −2
Original line number Diff line number Diff line
@@ -230,8 +230,17 @@ func (p *prebuiltCommon) AndroidMkEntries() []android.AndroidMkEntries { 
					// we need to remove the suffix from LOCAL_MODULE_STEM, otherwise

					// we will have foo.jar.jar

					entries.SetString("LOCAL_MODULE_STEM", strings.TrimSuffix(fi.stem(), ".jar"))

					entries.SetString("LOCAL_SOONG_CLASSES_JAR", fi.builtFile.String())

					entries.SetString("LOCAL_SOONG_HEADER_JAR", fi.builtFile.String())

					var classesJar android.Path

					var headerJar android.Path

					if javaModule, ok := fi.module.(java.ApexDependency); ok {

						classesJar = javaModule.ImplementationAndResourcesJars()[0]

						headerJar = javaModule.HeaderJars()[0]

					} else {

						classesJar = fi.builtFile

						headerJar = fi.builtFile

					}

					entries.SetString("LOCAL_SOONG_CLASSES_JAR", classesJar.String())

					entries.SetString("LOCAL_SOONG_HEADER_JAR", headerJar.String())

					entries.SetString("LOCAL_SOONG_DEX_JAR", fi.builtFile.String())

					entries.SetString("LOCAL_DEX_PREOPT", "false")

				},