aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorFabien Sanglard <sanglardf@google.com>2017-01-10 16:21:22 -0800
committerFabien Sanglard <sanglardf@google.com>2017-02-07 09:43:02 -0800
commitd61f1f455917ed6affe9361c0f89ddfcbfa50d02 (patch)
treea2739ccbe850c8383eb4f8b9b261604a49e11286 /android
parent6d34b308ff8c87425163c3dbc864aa388f18d468 (diff)
downloadbuild_soong-d61f1f455917ed6affe9361c0f89ddfcbfa50d02.tar.gz
build_soong-d61f1f455917ed6affe9361c0f89ddfcbfa50d02.tar.bz2
build_soong-d61f1f455917ed6affe9361c0f89ddfcbfa50d02.zip
Add support for CMakefile generation
Test: Manually generated CMakeLists.txt for gui/ui/aapt2. Change-Id: I7dedc300c1e50b8e39bc58091b650c0bbe2c62da
Diffstat (limited to 'android')
-rw-r--r--android/env.go4
-rw-r--r--android/register.go1
2 files changed, 1 insertions, 4 deletions
diff --git a/android/env.go b/android/env.go
index 3b523a2f..c7409e87 100644
--- a/android/env.go
+++ b/android/env.go
@@ -27,10 +27,6 @@ import (
// compare the contents of the environment variables, rewriting the file if necessary to cause
// a manifest regeneration.
-func init() {
- RegisterSingletonType("env", EnvSingleton)
-}
-
func EnvSingleton() blueprint.Singleton {
return &envSingleton{}
}
diff --git a/android/register.go b/android/register.go
index 0ad9d30c..d6b290db 100644
--- a/android/register.go
+++ b/android/register.go
@@ -77,6 +77,7 @@ func NewContext() *blueprint.Context {
handle.Parallel()
}
}
+ ctx.RegisterSingletonType("env", EnvSingleton)
return ctx
}