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

Commit 9a427930 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Update soong copy of java binaries when Make copy is installed"

parents 7eacdbf8 44b85d01

java/androidmk.go

+8 −1
Original line number Diff line number Diff line
@@ -287,9 +287,16 @@ func (binary *Binary) AndroidMkEntries() []android.AndroidMkEntries { 
			},

		}}

	} else {

		outputFile := binary.wrapperFile

		// Have Make installation trigger Soong installation by using Soong's install path as

		// the output file.

		if binary.Host() {

			outputFile = binary.binaryFile

		}



		return []android.AndroidMkEntries{android.AndroidMkEntries{

			Class:      "EXECUTABLES",

			OutputFile: android.OptionalPathForPath(binary.wrapperFile),

			OutputFile: android.OptionalPathForPath(outputFile),

			ExtraEntries: []android.AndroidMkExtraEntriesFunc{

				func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {

					entries.SetBool("LOCAL_STRIP_MODULE", false)