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

Commit 86e05669 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Stop prebuilt_apex/apex_set exporting invalid jars to Make" am:... 

Merge "Stop prebuilt_apex/apex_set exporting invalid jars to Make" am: 13dd2204 am: 964d2d7a am: a242a29f am: 3f3d8dcb am: b97af3ed

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853520

Change-Id: I343c4daae8859a679f56f0f05bc0697ada471dd2
parents 6a21cfff b97af3ed

apex/prebuilt.go

+0 −11
Original line number Diff line number Diff line
@@ -264,17 +264,6 @@ func (p *prebuiltCommon) createEntriesForApexFile(fi apexFile, apexName string) 
				// 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"))

				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")

			},