aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--androidbp/cmd/soong.go1
-rw-r--r--cc/cc.go18
-rw-r--r--common/arch.go42
-rw-r--r--common/module.go39
-rw-r--r--genrule/genrule.go4
-rw-r--r--java/java.go13
-rw-r--r--java/resources.go19
7 files changed, 61 insertions, 75 deletions
diff --git a/androidbp/cmd/soong.go b/androidbp/cmd/soong.go
index ecae5b0e..18b8af09 100644
--- a/androidbp/cmd/soong.go
+++ b/androidbp/cmd/soong.go
@@ -23,6 +23,7 @@ var standardProperties = map[string]struct {
// ==== LIST PROPERTIES ====
"srcs": {"LOCAL_SRC_FILES", bpparser.List},
+ "exclude_srcs": {"LOCAL_SRC_FILES_EXCLUDE", bpparser.List},
"shared_libs": {"LOCAL_SHARED_LIBRARIES", bpparser.List},
"static_libs": {"LOCAL_STATIC_LIBRARIES", bpparser.List},
"whole_static_libs": {"LOCAL_WHOLE_STATIC_LIBRARIES", bpparser.List},
diff --git a/cc/cc.go b/cc/cc.go
index 1bef029f..2cc4ffb8 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -154,7 +154,11 @@ type CCFlags struct {
// Properties used to compile all C or C++ modules
type CCBaseProperties struct {
// list of source files used to compile the C/C++ module. May be .c, .cpp, or .S files.
- Srcs []string `android:"arch_variant,arch_subtract"`
+ Srcs []string `android:"arch_variant"`
+
+ // list of source files that should not be used to build the C/C++ module.
+ // This is most useful in the arch/multilib variants to remove non-common files
+ Exclude_srcs []string `android:"arch_variant"`
// list of module-specific flags that will be used for C and C++ compiles.
Cflags []string `android:"arch_variant"`
@@ -528,11 +532,11 @@ func (c *CCBase) flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags {
// Compile a list of source files into objects a specified subdirectory
func (c *CCBase) customCompileObjs(ctx common.AndroidModuleContext, flags CCFlags,
- subdir string, srcFiles []string) []string {
+ subdir string, srcFiles, excludes []string) []string {
buildFlags := ccFlagsToBuilderFlags(flags)
- srcFiles = ctx.ExpandSources(srcFiles)
+ srcFiles = ctx.ExpandSources(srcFiles, excludes)
srcFiles, deps := genSources(ctx, srcFiles, buildFlags)
return TransformSourceToObj(ctx, subdir, srcFiles, buildFlags, deps)
@@ -545,7 +549,7 @@ func (c *CCBase) compileObjs(ctx common.AndroidModuleContext, flags CCFlags) []s
return nil
}
- return c.customCompileObjs(ctx, flags, "", c.Properties.Srcs)
+ return c.customCompileObjs(ctx, flags, "", c.Properties.Srcs, c.Properties.Exclude_srcs)
}
// Compile generated source files from dependencies
@@ -929,6 +933,7 @@ type CCLibraryProperties struct {
BuildShared bool `blueprint:"mutated"`
Static struct {
Srcs []string `android:"arch_variant"`
+ Exclude_srcs []string `android:"arch_variant"`
Cflags []string `android:"arch_variant"`
Whole_static_libs []string `android:"arch_variant"`
Static_libs []string `android:"arch_variant"`
@@ -936,6 +941,7 @@ type CCLibraryProperties struct {
} `android:"arch_variant"`
Shared struct {
Srcs []string `android:"arch_variant"`
+ Exclude_srcs []string `android:"arch_variant"`
Cflags []string `android:"arch_variant"`
Whole_static_libs []string `android:"arch_variant"`
Static_libs []string `android:"arch_variant"`
@@ -1088,7 +1094,7 @@ func (c *CCLibrary) compileStaticLibrary(ctx common.AndroidModuleContext,
staticFlags := flags
objFilesStatic := c.customCompileObjs(ctx, staticFlags, common.DeviceStaticLibrary,
- c.LibraryProperties.Static.Srcs)
+ c.LibraryProperties.Static.Srcs, c.LibraryProperties.Static.Exclude_srcs)
objFiles = append(objFiles, objFilesStatic...)
objFiles = append(objFiles, deps.WholeStaticLibObjFiles...)
@@ -1116,7 +1122,7 @@ func (c *CCLibrary) compileSharedLibrary(ctx common.AndroidModuleContext,
sharedFlags := flags
objFilesShared := c.customCompileObjs(ctx, sharedFlags, common.DeviceSharedLibrary,
- c.LibraryProperties.Shared.Srcs)
+ c.LibraryProperties.Shared.Srcs, c.LibraryProperties.Shared.Exclude_srcs)
objFiles = append(objFiles, objFilesShared...)
diff --git a/common/arch.go b/common/arch.go
index ba1f6712..60a17e44 100644
--- a/common/arch.go
+++ b/common/arch.go
@@ -628,12 +628,7 @@ func (a *AndroidModuleBase) extendPropertiesRecursive(ctx blueprint.EarlyMutator
dstFieldValue, srcFieldValue,
newRecursePrefix)
case reflect.Slice:
- val, err := archCombineSlices(dstFieldValue, srcFieldValue, tags["arch_subtract"])
- if err != nil {
- ctx.PropertyErrorf(propertyName, err.Error())
- continue
- }
- dstFieldValue.Set(val)
+ dstFieldValue.Set(reflect.AppendSlice(dstFieldValue, srcFieldValue))
case reflect.Ptr, reflect.Interface:
// Recursively extend the pointed-to struct's fields.
if dstFieldValue.IsNil() != srcFieldValue.IsNil() {
@@ -654,38 +649,3 @@ func (a *AndroidModuleBase) extendPropertiesRecursive(ctx blueprint.EarlyMutator
}
}
}
-
-func archCombineSlices(general, arch reflect.Value, canSubtract bool) (reflect.Value, error) {
- if !canSubtract {
- // Append the extension slice.
- return reflect.AppendSlice(general, arch), nil
- }
-
- // Support -val in arch list to subtract a value from original list
- l := general.Interface().([]string)
- for archIndex := 0; archIndex < arch.Len(); archIndex++ {
- archString := arch.Index(archIndex).String()
- if strings.HasPrefix(archString, "-") {
- generalIndex := findStringInSlice(archString[1:], l)
- if generalIndex == -1 {
- return reflect.Value{},
- fmt.Errorf("can't find %q to subtract from general properties", archString[1:])
- }
- l = append(l[:generalIndex], l[generalIndex+1:]...)
- } else {
- l = append(l, archString)
- }
- }
-
- return reflect.ValueOf(l), nil
-}
-
-func findStringInSlice(str string, slice []string) int {
- for i, s := range slice {
- if s == str {
- return i
- }
- }
-
- return -1
-}
diff --git a/common/module.go b/common/module.go
index 77e02952..1d17de10 100644
--- a/common/module.go
+++ b/common/module.go
@@ -53,7 +53,7 @@ type AndroidModuleContext interface {
blueprint.ModuleContext
androidBaseContext
- ExpandSources(srcFiles []string) []string
+ ExpandSources(srcFiles, excludes []string) []string
Glob(globPattern string, excludes []string) []string
InstallFile(installPath, srcPath string, deps ...string) string
@@ -472,32 +472,37 @@ func isAndroidModule(m blueprint.Module) bool {
return ok
}
-func (ctx *androidModuleContext) ExpandSources(srcFiles []string) []string {
+func findStringInSlice(str string, slice []string) int {
+ for i, s := range slice {
+ if s == str {
+ return i
+ }
+ }
+ return -1
+}
+
+func (ctx *androidModuleContext) ExpandSources(srcFiles, excludes []string) []string {
prefix := ModuleSrcDir(ctx)
- for i, srcFile := range srcFiles {
- if srcFile[0] == '-' {
- srcFiles[i] = "-" + filepath.Join(prefix, srcFile[1:])
- } else {
- srcFiles[i] = filepath.Join(prefix, srcFile)
+ for i, e := range excludes {
+ j := findStringInSlice(e, srcFiles)
+ if j != -1 {
+ srcFiles = append(srcFiles[:j], srcFiles[j+1:]...)
}
+
+ excludes[i] = filepath.Join(prefix, e)
}
- if !hasGlob(srcFiles) {
- return srcFiles
+ for i, srcFile := range srcFiles {
+ srcFiles[i] = filepath.Join(prefix, srcFile)
}
- var excludes []string
- for _, s := range srcFiles {
- if s[0] == '-' {
- excludes = append(excludes, s[1:])
- }
+ if !hasGlob(srcFiles) {
+ return srcFiles
}
globbedSrcFiles := make([]string, 0, len(srcFiles))
for _, s := range srcFiles {
- if s[0] == '-' {
- continue
- } else if glob.IsGlob(s) {
+ if glob.IsGlob(s) {
globbedSrcFiles = append(globbedSrcFiles, ctx.Glob(s, excludes)...)
} else {
globbedSrcFiles = append(globbedSrcFiles, s)
diff --git a/genrule/genrule.go b/genrule/genrule.go
index b3938318..2052dfdd 100644
--- a/genrule/genrule.go
+++ b/genrule/genrule.go
@@ -134,7 +134,7 @@ func GenSrcsFactory() (blueprint.Module, []interface{}) {
properties := &genSrcsProperties{}
tasks := func(ctx common.AndroidModuleContext) []generateTask {
- srcFiles := ctx.ExpandSources(properties.Srcs)
+ srcFiles := ctx.ExpandSources(properties.Srcs, nil)
tasks := make([]generateTask, 0, len(srcFiles))
for _, in := range srcFiles {
out := pathtools.ReplaceExtension(in, properties.Output_extension)
@@ -161,7 +161,7 @@ func GenRuleFactory() (blueprint.Module, []interface{}) {
tasks := func(ctx common.AndroidModuleContext) []generateTask {
return []generateTask{
{
- in: ctx.ExpandSources(properties.Srcs),
+ in: ctx.ExpandSources(properties.Srcs, nil),
out: filepath.Join(common.ModuleGenDir(ctx), properties.Out),
},
}
diff --git a/java/java.go b/java/java.go
index a16d1d67..94f6914e 100644
--- a/java/java.go
+++ b/java/java.go
@@ -47,11 +47,18 @@ import (
type javaBaseProperties struct {
// list of source files used to compile the Java module. May be .java, .logtags, .proto,
// or .aidl files.
- Srcs []string `android:"arch_variant,arch_subtract"`
+ Srcs []string `android:"arch_variant"`
+
+ // list of source files that should not be used to build the Java module.
+ // This is most useful in the arch/multilib variants to remove non-common files
+ Exclude_srcs []string `android:"arch_variant"`
// list of directories containing Java resources
Java_resource_dirs []string `android:"arch_variant"`
+ // list of directories that should be excluded from java_resource_dirs
+ Exclude_java_resource_dirs []string `android:"arch_variant"`
+
// don't build against the default libraries (core-libart, core-junit,
// ext, and framework for device targets)
No_standard_libraries bool
@@ -294,7 +301,7 @@ func (j *javaBase) GenerateJavaBuildActions(ctx common.AndroidModuleContext) {
javacDeps = append(javacDeps, classpath...)
}
- srcFiles := ctx.ExpandSources(j.properties.Srcs)
+ srcFiles := ctx.ExpandSources(j.properties.Srcs, j.properties.Exclude_srcs)
srcFiles = j.genSources(ctx, srcFiles, flags)
@@ -316,7 +323,7 @@ func (j *javaBase) GenerateJavaBuildActions(ctx common.AndroidModuleContext) {
classJarSpecs = append([]jarSpec{classes}, classJarSpecs...)
}
- resourceJarSpecs = append(ResourceDirsToJarSpecs(ctx, j.properties.Java_resource_dirs),
+ resourceJarSpecs = append(ResourceDirsToJarSpecs(ctx, j.properties.Java_resource_dirs, j.properties.Exclude_java_resource_dirs),
resourceJarSpecs...)
manifest := j.properties.Manifest
diff --git a/java/resources.go b/java/resources.go
index f9d7a05b..dfdbeb5d 100644
--- a/java/resources.go
+++ b/java/resources.go
@@ -29,13 +29,20 @@ var resourceExcludes = []string{
"**/*~",
}
-func ResourceDirsToJarSpecs(ctx common.AndroidModuleContext, resourceDirs []string) []jarSpec {
+func isStringInSlice(str string, slice []string) bool {
+ for _, s := range slice {
+ if s == str {
+ return true
+ }
+ }
+ return false
+}
+
+func ResourceDirsToJarSpecs(ctx common.AndroidModuleContext, resourceDirs, excludeDirs []string) []jarSpec {
var excludes []string
- for _, resourceDir := range resourceDirs {
- if resourceDir[0] == '-' {
- excludes = append(excludes, filepath.Join(common.ModuleSrcDir(ctx), resourceDir[1:], "**/*"))
- }
+ for _, exclude := range excludeDirs {
+ excludes = append(excludes, filepath.Join(common.ModuleSrcDir(ctx), exclude, "**/*"))
}
excludes = append(excludes, resourceExcludes...)
@@ -43,7 +50,7 @@ func ResourceDirsToJarSpecs(ctx common.AndroidModuleContext, resourceDirs []stri
var jarSpecs []jarSpec
for _, resourceDir := range resourceDirs {
- if resourceDir[0] == '-' {
+ if isStringInSlice(resourceDir, excludeDirs) {
continue
}
resourceDir := filepath.Join(common.ModuleSrcDir(ctx), resourceDir)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 04:18:19 +0000