aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-03-07 20:56:24 -0800
committerDan Willemsen <dwillemsen@google.com>2016-03-07 21:05:02 -0800
commit71ea9c13c90b2c5bfefd196caa442777eb0f8ce2 (patch)
treec20e04148251704894f459523c6ceddc038318cd
parentf3af6ce6314a3d32b3b563806a6f990b1af9772a (diff)
downloadbuild_soong-71ea9c13c90b2c5bfefd196caa442777eb0f8ce2.tar.gz
build_soong-71ea9c13c90b2c5bfefd196caa442777eb0f8ce2.tar.bz2
build_soong-71ea9c13c90b2c5bfefd196caa442777eb0f8ce2.zip
Use optional_dirs for non-soong projects
On some branches, some of these projects may not exist. Use dirs for the blueprint / soong projects, and optional_dirs for everything else. Change-Id: I2b84948f1818941a21981c135bd6237852bfcc8b
-rw-r--r--root.bp11
1 files changed, 7 insertions, 4 deletions
diff --git a/root.bp b/root.bp
index d32cf8ad..8ba1c124 100644
--- a/root.bp
+++ b/root.bp
@@ -2,20 +2,23 @@ subname = "Android.bp"
subdirs = [
"build/blueprint",
- "build/kati",
"build/soong",
+]
+
+optional_subdirs = [
"bionic/*",
+ "build/kati",
+ "build/tools/*",
"dalvik",
"external/*",
"frameworks/base",
"frameworks/native/libs/*",
"hardware/*",
"libcore",
+ "packages/apps/HTMLViewer",
"prebuilts/ndk",
"prebuilts/sdk",
"system/core/*",
- "packages/apps/HTMLViewer",
- "build/tools/*",
- "system/security/*",
"system/keymaster",
+ "system/security/*",
]