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

Merge "add stem property to java modules"

Browse Source
This commit is contained in:
Treehugger Robot
2019-10-28 06:23:32 +00:00
committed by Gerrit Code Review
parent b480debbd8 4c4c02400f
commit d3f11c13b1
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/java.go
View File

@@ -274,6 +274,9 @@ type CompilerDeviceProperties struct {
// otherwise provides defaults libraries to add to the bootclasspath. // otherwise provides defaults libraries to add to the bootclasspath.
System_modules *string System_modules *string
// set the name of the output
Stem *string
UncompressDex bool `blueprint:"mutated"` UncompressDex bool `blueprint:"mutated"`
IsSDKLibrary bool `blueprint:"mutated"` IsSDKLibrary bool `blueprint:"mutated"`
} }
@@ -1600,7 +1603,8 @@ func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bo
} }
func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.dexpreopter.installPath = android.PathForModuleInstall(ctx, "framework", ctx.ModuleName()+".jar") j.dexpreopter.installPath = android.PathForModuleInstall(ctx, "framework",
proptools.StringDefault(j.deviceProperties.Stem, ctx.ModuleName())+".jar")
j.dexpreopter.isSDKLibrary = j.deviceProperties.IsSDKLibrary j.dexpreopter.isSDKLibrary = j.deviceProperties.IsSDKLibrary
j.dexpreopter.isInstallable = Bool(j.properties.Installable) j.dexpreopter.isInstallable = Bool(j.properties.Installable)
j.dexpreopter.uncompressedDex = shouldUncompressDex(ctx, &j.dexpreopter) j.dexpreopter.uncompressedDex = shouldUncompressDex(ctx, &j.dexpreopter)
@@ -1924,6 +1928,9 @@ type ImportProperties struct {
// if set to true, run Jetifier against .jar file. Defaults to false. // if set to true, run Jetifier against .jar file. Defaults to false.
Jetifier *bool Jetifier *bool
// set the name of the output
Stem *string
} }
type Import struct { type Import struct {
@@ -1966,7 +1973,7 @@ func (j *Import) DepsMutator(ctx android.BottomUpMutatorContext) {
func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
jars := android.PathsForModuleSrc(ctx, j.properties.Jars) jars := android.PathsForModuleSrc(ctx, j.properties.Jars)
jarName := ctx.ModuleName() + ".jar" jarName := proptools.StringDefault(j.properties.Stem, ctx.ModuleName()) + ".jar"
outputFile := android.PathForModuleOut(ctx, "combined", jarName) outputFile := android.PathForModuleOut(ctx, "combined", jarName)
TransformJarsToJar(ctx, outputFile, "for prebuilts", jars, android.OptionalPath{}, TransformJarsToJar(ctx, outputFile, "for prebuilts", jars, android.OptionalPath{},
false, j.properties.Exclude_files, j.properties.Exclude_dirs) false, j.properties.Exclude_files, j.properties.Exclude_dirs)
@@ -2000,7 +2007,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.exportedSdkLibs = android.FirstUniqueStrings(j.exportedSdkLibs) j.exportedSdkLibs = android.FirstUniqueStrings(j.exportedSdkLibs)
if Bool(j.properties.Installable) { if Bool(j.properties.Installable) {
ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"), ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"),
ctx.ModuleName()+".jar", outputFile) jarName, outputFile)
} }
} }
@@ -2112,6 +2119,9 @@ func ImportFactoryHost() android.Module {
type DexImportProperties struct { type DexImportProperties struct {
Jars []string `android:"path"` Jars []string `android:"path"`
// set the name of the output
Stem *string
} }
type DexImport struct { type DexImport struct {
@@ -2145,7 +2155,8 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
ctx.PropertyErrorf("jars", "exactly one jar must be provided") ctx.PropertyErrorf("jars", "exactly one jar must be provided")
} }
j.dexpreopter.installPath = android.PathForModuleInstall(ctx, "framework", ctx.ModuleName()+".jar") j.dexpreopter.installPath = android.PathForModuleInstall(ctx, "framework",
proptools.StringDefault(j.properties.Stem, ctx.ModuleName())+".jar")
j.dexpreopter.isInstallable = true j.dexpreopter.isInstallable = true
j.dexpreopter.uncompressedDex = shouldUncompressDex(ctx, &j.dexpreopter) j.dexpreopter.uncompressedDex = shouldUncompressDex(ctx, &j.dexpreopter)