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

Commit 363360c9 authored by Colin Cross's avatar Colin Cross
Browse files

Support target.hostdex.required 

Hostdex modules sometimes need extra required modules, add
target.hostdex.required.

Bug: 131167818
Test: manual
Change-Id: I599f3499f0b738556baeb27185371a42b4c2701b
Merged-In: I599f3499f0b738556baeb27185371a42b4c2701b
(cherry picked from commit 7f87f4fd)
parent a25a2779

java/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ func (library *Library) AndroidMkHostDex(w io.Writer, name string, data android. 
		fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", library.headerJarFile.String())

		fmt.Fprintln(w, "LOCAL_SOONG_CLASSES_JAR :=", library.implementationAndResourcesJar.String())

		fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES := "+strings.Join(data.Required, " "))

		if r := library.deviceProperties.Target.Hostdex.Required; len(r) > 0 {

			fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES +=", strings.Join(r, " "))

		}

		fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_java_prebuilt.mk")

	}

}

java/java.go

+7 −0
Original line number Diff line number Diff line
@@ -221,6 +221,13 @@ type CompilerDeviceProperties struct { 
	// If true, export a copy of the module as a -hostdex module for host testing.

	Hostdex *bool



	Target struct {

		Hostdex struct {

			// Additional required dependencies to add to -hostdex modules.

			Required []string

		}

	}



	// If set to true, compile dex regardless of installable.  Defaults to false.

	Compile_dex *bool