commit a34ac17862eeee7d5fb0dd272bcb430134cc0103
author Colin Cross <ccross@android.com> Fri Jul 10 00:58:45 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 10 00:58:47 2015 +0000
tree 14298dbc9dc2b3805e880ad543ef3a9ce46f9a61
parent f3162d8deaa093b05608f900b27508171bfea06c
parent 9883a73f5dde81873654689befb8b3fbc0a60a53

Merge "use init functions to register module types, etc." into master-soong

build/Android.bp

diff --git a/build/Android.bp b/build/Android.bp
index 6a42a04..9d7e396 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -14,6 +14,7 @@
     name: "soong-art",
     pkgPath: "android/soong/art",
     deps: [
+        "soong",
         "soong-cc",
     ],
     srcs: [

build/art.go

diff --git a/build/art.go b/build/art.go
index b3ebfd5..c690fba 100644
--- a/build/art.go
+++ b/build/art.go
@@ -1,6 +1,7 @@
 package art
 
 import (
+	"android/soong"
 	"android/soong/cc"
 	"android/soong/common"
 	"runtime"
@@ -19,6 +20,11 @@
 	cc.CCLibrary
 }
 
+func init() {
+	soong.RegisterModuleType("art_cc_library", ArtCCLibraryFactory)
+	soong.RegisterModuleType("art_cc_binary", ArtCCBinaryFactory)
+}
+
 func ArtCCLibraryFactory() (blueprint.Module, []interface{}) {
 	module := &artCCLibrary{}