aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/soong_build
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2015-03-23 17:50:24 -0700
committerColin Cross <ccross@android.com>2015-03-25 11:33:06 -0700
commit97ba07383367bdd5189ccdf9c7dfc16e1ebdbe4a (patch)
treeecba5a87924e3ad27ff4b1ab3fb5c6f4be803904 /cmd/soong_build
parent70b4059e3fae2608bd65dfae836f2f1f781addc9 (diff)
downloadbuild_soong-97ba07383367bdd5189ccdf9c7dfc16e1ebdbe4a.tar.gz
build_soong-97ba07383367bdd5189ccdf9c7dfc16e1ebdbe4a.tar.bz2
build_soong-97ba07383367bdd5189ccdf9c7dfc16e1ebdbe4a.zip
Export cc types for art to inherit from
Art needs a custom module type in order to perform complicated build logic like depending on environment variables and varying cflags based on cpu variant. Export enough of the types and functions from cc for art_cc_library to inherit from cc_library. While I'm touching every line, also rename the New* methods to *Factory. Change-Id: I7123aa47019c4ced7a1ab57c394225bc7844b5ea
Diffstat (limited to 'cmd/soong_build')
-rw-r--r--cmd/soong_build/main.go22
1 files changed, 11 insertions, 11 deletions
diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go
index cea0fa61..6b7bcf11 100644
--- a/cmd/soong_build/main.go
+++ b/cmd/soong_build/main.go
@@ -38,20 +38,20 @@ func main() {
ctx := blueprint.NewContext()
// Module types
- ctx.RegisterModuleType("cc_library_static", cc.NewCCLibraryStatic)
- ctx.RegisterModuleType("cc_library_shared", cc.NewCCLibraryShared)
- ctx.RegisterModuleType("cc_library", cc.NewCCLibrary)
- ctx.RegisterModuleType("cc_object", cc.NewCCObject)
- ctx.RegisterModuleType("cc_binary", cc.NewCCBinary)
- ctx.RegisterModuleType("cc_test", cc.NewCCTest)
+ ctx.RegisterModuleType("cc_library_static", cc.CCLibraryStaticFactory)
+ ctx.RegisterModuleType("cc_library_shared", cc.CCLibrarySharedFactory)
+ ctx.RegisterModuleType("cc_library", cc.CCLibraryFactory)
+ ctx.RegisterModuleType("cc_object", cc.CCObjectFactory)
+ ctx.RegisterModuleType("cc_binary", cc.CCBinaryFactory)
+ ctx.RegisterModuleType("cc_test", cc.CCTestFactory)
- ctx.RegisterModuleType("toolchain_library", cc.NewToolchainLibrary)
+ ctx.RegisterModuleType("toolchain_library", cc.ToolchainLibraryFactory)
- ctx.RegisterModuleType("cc_library_host_static", cc.NewCCLibraryHostStatic)
- ctx.RegisterModuleType("cc_library_host_shared", cc.NewCCLibraryHostShared)
- ctx.RegisterModuleType("cc_binary_host", cc.NewCCBinaryHost)
+ ctx.RegisterModuleType("cc_library_host_static", cc.CCLibraryHostStaticFactory)
+ ctx.RegisterModuleType("cc_library_host_shared", cc.CCLibraryHostSharedFactory)
+ ctx.RegisterModuleType("cc_binary_host", cc.CCBinaryHostFactory)
- ctx.RegisterModuleType("gensrcs", genrule.NewGenSrcs)
+ ctx.RegisterModuleType("gensrcs", genrule.GenSrcsFactory)
// Mutators
ctx.RegisterEarlyMutator("arch", common.ArchMutator)