Simplify vendor conditionals
Support vendor conditionals with no Go code.
Test: TestSoongConfigModule
Change-Id: I42546e7f17324921ada80f4d8e1cd399830f8dfc
diff --git a/Android.bp b/Android.bp
index c4c958c..562b1c8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,6 +36,7 @@
"blueprint",
"blueprint-bootstrap",
"soong",
+ "soong-android-soongconfig",
"soong-env",
"soong-shared",
],
@@ -73,6 +74,7 @@
"android/sdk.go",
"android/sh_binary.go",
"android/singleton.go",
+ "android/soong_config_modules.go",
"android/testing.go",
"android/util.go",
"android/variable.go",
@@ -101,6 +103,7 @@
"android/prebuilt_test.go",
"android/prebuilt_etc_test.go",
"android/rule_builder_test.go",
+ "android/soong_config_modules_test.go",
"android/util_test.go",
"android/variable_test.go",
"android/visibility_test.go",
@@ -109,6 +112,20 @@
}
bootstrap_go_package {
+ name: "soong-android-soongconfig",
+ pkgPath: "android/soong/android/soongconfig",
+ deps: [
+ "blueprint",
+ "blueprint-parser",
+ "blueprint-proptools",
+ ],
+ srcs: [
+ "android/soongconfig/config.go",
+ "android/soongconfig/modules.go",
+ ],
+}
+
+bootstrap_go_package {
name: "soong-cc-config",
pkgPath: "android/soong/cc/config",
deps: [