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

Merge "Consistently use Bool instead of proptools.Bool"

Browse Source 
am: b3f16dea37

Change-Id: Ibfd7205b616690b45092307b2a4f21c15363055e
This commit is contained in:
Colin Cross
2018-04-11 07:54:53 -07:00
committed by android-build-merger
parent 500156a876 b3f16dea37
commit e56f26526c
6 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/arch.go
View File

@@ -854,17 +854,17 @@ func decodeTargetProductVariables(config *config) (map[OsClass][]Target, error)
addTarget(BuildOs, *variables.HostSecondaryArch, nil, nil, nil) addTarget(BuildOs, *variables.HostSecondaryArch, nil, nil, nil)
} }
if config.Host_bionic != nil && *config.Host_bionic { if Bool(config.Host_bionic) {
addTarget(LinuxBionic, "x86_64", nil, nil, nil) addTarget(LinuxBionic, "x86_64", nil, nil, nil)
} }
if variables.CrossHost != nil && *variables.CrossHost != "" { if String(variables.CrossHost) != "" {
crossHostOs := osByName(*variables.CrossHost) crossHostOs := osByName(*variables.CrossHost)
if crossHostOs == NoOsType { if crossHostOs == NoOsType {
return nil, fmt.Errorf("Unknown cross host OS %q", *variables.CrossHost) return nil, fmt.Errorf("Unknown cross host OS %q", *variables.CrossHost)
} }
if variables.CrossHostArch == nil || *variables.CrossHostArch == "" { if String(variables.CrossHostArch) == "" {
return nil, fmt.Errorf("No cross-host primary architecture set") return nil, fmt.Errorf("No cross-host primary architecture set")
} }

3
cc/proto.go
View File

@@ -19,7 +19,6 @@ import (
"github.com/google/blueprint" "github.com/google/blueprint"
"github.com/google/blueprint/pathtools" "github.com/google/blueprint/pathtools"
"github.com/google/blueprint/proptools"
"android/soong/android" "android/soong/android"
) )
@@ -114,7 +113,7 @@ func protoFlags(ctx ModuleContext, flags Flags, p *android.ProtoProperties) Flag
flags.protoFlags = android.ProtoFlags(ctx, p) flags.protoFlags = android.ProtoFlags(ctx, p)
if proptools.String(p.Proto.Type) == "lite" { if String(p.Proto.Type) == "lite" {
flags.protoOutParams = append(flags.protoOutParams, "lite") flags.protoOutParams = append(flags.protoOutParams, "lite")
} }

6
java/androidmk.go
View File

@@ -19,8 +19,6 @@ import (
"io" "io"
"strings" "strings"
"github.com/google/blueprint/proptools"
"android/soong/android" "android/soong/android"
) )
@@ -77,7 +75,7 @@ func (library *Library) AndroidMk() android.AndroidMkData {
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) { Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
android.WriteAndroidMkData(w, data) android.WriteAndroidMkData(w, data)
if proptools.Bool(library.deviceProperties.Hostdex) && !library.Host() { if Bool(library.deviceProperties.Hostdex) && !library.Host() {
fmt.Fprintln(w, "include $(CLEAR_VARS)") fmt.Fprintln(w, "include $(CLEAR_VARS)")
fmt.Fprintln(w, "LOCAL_MODULE := "+name+"-hostdex") fmt.Fprintln(w, "LOCAL_MODULE := "+name+"-hostdex")
fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true") fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true")
@@ -117,7 +115,7 @@ func (prebuilt *Import) AndroidMk() android.AndroidMkData {
Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk", Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
Extra: []android.AndroidMkExtraFunc{ Extra: []android.AndroidMkExtraFunc{
func(w io.Writer, outputFile android.Path) { func(w io.Writer, outputFile android.Path) {
fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := ", !proptools.Bool(prebuilt.properties.Installable)) fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := ", !Bool(prebuilt.properties.Installable))
fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", prebuilt.combinedClasspathFile.String()) fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", prebuilt.combinedClasspathFile.String())
fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", String(prebuilt.properties.Sdk_version)) fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", String(prebuilt.properties.Sdk_version))
}, },

10
java/java.go
View File

@@ -459,14 +459,14 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep {
func (j *Module) deps(ctx android.BottomUpMutatorContext) { func (j *Module) deps(ctx android.BottomUpMutatorContext) {
if ctx.Device() { if ctx.Device() {
if !proptools.Bool(j.properties.No_standard_libs) { if !Bool(j.properties.No_standard_libs) {
sdkDep := decodeSdkDep(ctx, String(j.deviceProperties.Sdk_version)) sdkDep := decodeSdkDep(ctx, String(j.deviceProperties.Sdk_version))
if sdkDep.useDefaultLibs { if sdkDep.useDefaultLibs {
ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultBootclasspathLibraries...) ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultBootclasspathLibraries...)
if ctx.Config().TargetOpenJDK9() { if ctx.Config().TargetOpenJDK9() {
ctx.AddDependency(ctx.Module(), systemModulesTag, config.DefaultSystemModules) ctx.AddDependency(ctx.Module(), systemModulesTag, config.DefaultSystemModules)
} }
if !proptools.Bool(j.properties.No_framework_libs) { if !Bool(j.properties.No_framework_libs) {
ctx.AddDependency(ctx.Module(), libTag, config.DefaultLibraries...) ctx.AddDependency(ctx.Module(), libTag, config.DefaultLibraries...)
} }
} else if sdkDep.useModule { } else if sdkDep.useModule {
@@ -907,7 +907,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
// Don't add kotlin-stdlib if using (on-device) renamed stdlib // Don't add kotlin-stdlib if using (on-device) renamed stdlib
// (it's expected to be on device bootclasspath) // (it's expected to be on device bootclasspath)
if !proptools.Bool(j.properties.Renamed_kotlin_stdlib) { if !Bool(j.properties.Renamed_kotlin_stdlib) {
jars = append(jars, deps.kotlinStdlib...) jars = append(jars, deps.kotlinStdlib...)
} }
} }
@@ -984,7 +984,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
resArgs = append(resArgs, fileArgs...) resArgs = append(resArgs, fileArgs...)
resDeps = append(resDeps, fileDeps...) resDeps = append(resDeps, fileDeps...)
if proptools.Bool(j.properties.Include_srcs) { if Bool(j.properties.Include_srcs) {
srcArgs, srcDeps := SourceFilesToJarArgs(ctx, j.properties.Srcs, j.properties.Exclude_srcs) srcArgs, srcDeps := SourceFilesToJarArgs(ctx, j.properties.Srcs, j.properties.Exclude_srcs)
resArgs = append(resArgs, srcArgs...) resArgs = append(resArgs, srcArgs...)
resDeps = append(resDeps, srcDeps...) resDeps = append(resDeps, srcDeps...)
@@ -1026,7 +1026,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
} }
// Use renamed kotlin standard library? // Use renamed kotlin standard library?
if srcFiles.HasExt(".kt") && proptools.Bool(j.properties.Renamed_kotlin_stdlib) { if srcFiles.HasExt(".kt") && Bool(j.properties.Renamed_kotlin_stdlib) {
jarjarFile := android.PathForModuleOut(ctx, "kotlin-renamed", jarName) jarjarFile := android.PathForModuleOut(ctx, "kotlin-renamed", jarName)
TransformJarJar(ctx, jarjarFile, outputFile, TransformJarJar(ctx, jarjarFile, outputFile,
android.PathForSource(ctx, "external/kotlinc/jarjar-rules.txt")) android.PathForSource(ctx, "external/kotlinc/jarjar-rules.txt"))

9
java/proto.go
View File

@@ -18,7 +18,6 @@ import (
"strings" "strings"
"github.com/google/blueprint" "github.com/google/blueprint"
"github.com/google/blueprint/proptools"
"android/soong/android" "android/soong/android"
) )
@@ -67,7 +66,7 @@ func genProto(ctx android.ModuleContext, protoFile android.Path, flags javaBuild
} }
func protoDeps(ctx android.BottomUpMutatorContext, p *android.ProtoProperties) { func protoDeps(ctx android.BottomUpMutatorContext, p *android.ProtoProperties) {
switch proptools.String(p.Proto.Type) { switch String(p.Proto.Type) {
case "micro": case "micro":
ctx.AddDependency(ctx.Module(), staticLibTag, "libprotobuf-java-micro") ctx.AddDependency(ctx.Module(), staticLibTag, "libprotobuf-java-micro")
case "nano": case "nano":
@@ -82,14 +81,14 @@ func protoDeps(ctx android.BottomUpMutatorContext, p *android.ProtoProperties) {
} }
default: default:
ctx.PropertyErrorf("proto.type", "unknown proto type %q", ctx.PropertyErrorf("proto.type", "unknown proto type %q",
proptools.String(p.Proto.Type)) String(p.Proto.Type))
} }
} }
func protoFlags(ctx android.ModuleContext, j *CompilerProperties, p *android.ProtoProperties, func protoFlags(ctx android.ModuleContext, j *CompilerProperties, p *android.ProtoProperties,
flags javaBuilderFlags) javaBuilderFlags { flags javaBuilderFlags) javaBuilderFlags {
switch proptools.String(p.Proto.Type) { switch String(p.Proto.Type) {
case "micro": case "micro":
flags.protoOutTypeFlag = "--javamicro_out" flags.protoOutTypeFlag = "--javamicro_out"
case "nano": case "nano":
@@ -101,7 +100,7 @@ func protoFlags(ctx android.ModuleContext, j *CompilerProperties, p *android.Pro
flags.protoOutTypeFlag = "--java_out" flags.protoOutTypeFlag = "--java_out"
default: default:
ctx.PropertyErrorf("proto.type", "unknown proto type %q", ctx.PropertyErrorf("proto.type", "unknown proto type %q",
proptools.String(p.Proto.Type)) String(p.Proto.Type))
} }
if len(j.Proto.Output_params) > 0 { if len(j.Proto.Output_params) > 0 {

4
python/python.go
View File

@@ -252,9 +252,9 @@ func (p *Module) HostToolPath() android.OptionalPath {
func (p *Module) isEmbeddedLauncherEnabled(actual_version string) bool { func (p *Module) isEmbeddedLauncherEnabled(actual_version string) bool {
switch actual_version { switch actual_version {
case pyVersion2: case pyVersion2:
return proptools.Bool(p.properties.Version.Py2.Embedded_launcher) return Bool(p.properties.Version.Py2.Embedded_launcher)
case pyVersion3: case pyVersion3:
return proptools.Bool(p.properties.Version.Py3.Embedded_launcher) return Bool(p.properties.Version.Py3.Embedded_launcher)
} }
return false return false