StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export java_host_for_device and java_device_for_host modules to Make

Browse Source 
Robolectric needs to reference some modules declared with
java_host_for_device and java_device_for_host from Make for now.

Bug: 122331577
Test: m checkbuild
Change-Id: I09b3848edb120f2c3ee16b449b937b650f59811b
This commit is contained in:
Colin Cross
2019-04-23 22:04:46 -07:00
parent 159a585251
commit 28c3eb6829
1 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
java/device_host_converter.go
View File

@@ -15,9 +15,12 @@
package java package java
import ( import (
"android/soong/android" "fmt"
"io"
"github.com/google/blueprint" "github.com/google/blueprint"
"android/soong/android"
) )
type DeviceHostConverter struct { type DeviceHostConverter struct {
@@ -30,6 +33,9 @@ type DeviceHostConverter struct {
implementationJars android.Paths implementationJars android.Paths
implementationAndResourceJars android.Paths implementationAndResourceJars android.Paths
resourceJars android.Paths resourceJars android.Paths
combinedHeaderJar android.Path
combinedImplementationJar android.Path
} }
type DeviceHostConverterProperties struct { type DeviceHostConverterProperties struct {
@@ -98,6 +104,27 @@ func (d *DeviceHostConverter) GenerateAndroidBuildActions(ctx android.ModuleCont
ctx.PropertyErrorf("libs", "module %q cannot be used as a dependency", ctx.OtherModuleName(m)) ctx.PropertyErrorf("libs", "module %q cannot be used as a dependency", ctx.OtherModuleName(m))
} }
}) })
jarName := ctx.ModuleName() + ".jar"
if len(d.implementationAndResourceJars) > 1 {
outputFile := android.PathForModuleOut(ctx, "combined", jarName)
TransformJarsToJar(ctx, outputFile, "combine", d.implementationAndResourceJars,
android.OptionalPath{}, false, nil, nil)
d.combinedImplementationJar = outputFile
} else {
d.combinedImplementationJar = d.implementationAndResourceJars[0]
}
if len(d.headerJars) > 1 {
outputFile := android.PathForModuleOut(ctx, "turbine-combined", jarName)
TransformJarsToJar(ctx, outputFile, "turbine combine", d.headerJars,
android.OptionalPath{}, false, nil, nil)
d.combinedHeaderJar = outputFile
} else {
d.combinedHeaderJar = d.headerJars[0]
}
} }
var _ Dependency = (*DeviceHostConverter)(nil) var _ Dependency = (*DeviceHostConverter)(nil)
@@ -129,3 +156,18 @@ func (d *DeviceHostConverter) AidlIncludeDirs() android.Paths {
func (d *DeviceHostConverter) ExportedSdkLibs() []string { func (d *DeviceHostConverter) ExportedSdkLibs() []string {
return nil return nil
} }
func (d *DeviceHostConverter) AndroidMk() android.AndroidMkData {
return android.AndroidMkData{
Class: "JAVA_LIBRARIES",
OutputFile: android.OptionalPathForPath(d.combinedImplementationJar),
Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
Extra: []android.AndroidMkExtraFunc{
func(w io.Writer, outputFile android.Path) {
fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")
fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", d.combinedHeaderJar.String())
fmt.Fprintln(w, "LOCAL_SOONG_CLASSES_JAR :=", d.combinedImplementationJar.String())
},
},
}
}