Simplify compileObjs
None of the direct users of compileObjs were using any of its
complexity (generated sources, excluded sources, extra sources). Move
the complexity back in to baseCompiler.compile.
Test: m -j
Change-Id: I2e59d216682c00dd12a1395cf2448827d1c48023
diff --git a/cc/library.go b/cc/library.go
index a61e6a1..d3d142e 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -25,9 +25,8 @@
type LibraryProperties struct {
Static struct {
- Srcs []string `android:"arch_variant"`
- Exclude_srcs []string `android:"arch_variant"`
- Cflags []string `android:"arch_variant"`
+ Srcs []string `android:"arch_variant"`
+ Cflags []string `android:"arch_variant"`
Enabled *bool `android:"arch_variant"`
Whole_static_libs []string `android:"arch_variant"`
@@ -35,9 +34,8 @@
Shared_libs []string `android:"arch_variant"`
} `android:"arch_variant"`
Shared struct {
- Srcs []string `android:"arch_variant"`
- Exclude_srcs []string `android:"arch_variant"`
- Cflags []string `android:"arch_variant"`
+ Srcs []string `android:"arch_variant"`
+ Cflags []string `android:"arch_variant"`
Enabled *bool `android:"arch_variant"`
Whole_static_libs []string `android:"arch_variant"`
@@ -253,18 +251,16 @@
objFiles = library.baseCompiler.compile(ctx, flags, deps)
library.reuseObjFiles = objFiles
-
- pathDeps := deps.GeneratedHeaders
- pathDeps = append(pathDeps, ndkPathDeps(ctx)...)
+ buildFlags := flagsToBuilderFlags(flags)
if library.static() {
- objFiles = append(objFiles, compileObjs(ctx, flags, android.DeviceStaticLibrary,
- library.Properties.Static.Srcs, library.Properties.Static.Exclude_srcs,
- nil, pathDeps)...)
+ srcs := android.PathsForModuleSrc(ctx, library.Properties.Static.Srcs)
+ objFiles = append(objFiles, compileObjs(ctx, buildFlags, android.DeviceStaticLibrary,
+ srcs, library.baseCompiler.deps)...)
} else {
- objFiles = append(objFiles, compileObjs(ctx, flags, android.DeviceSharedLibrary,
- library.Properties.Shared.Srcs, library.Properties.Shared.Exclude_srcs,
- nil, pathDeps)...)
+ srcs := android.PathsForModuleSrc(ctx, library.Properties.Shared.Srcs)
+ objFiles = append(objFiles, compileObjs(ctx, buildFlags, android.DeviceSharedLibrary,
+ srcs, library.baseCompiler.deps)...)
}
return objFiles