commit 71ea9c13c90b2c5bfefd196caa442777eb0f8ce2
author Dan Willemsen <dwillemsen@google.com> Mon Mar 07 20:56:24 2016 -0800
committer Dan Willemsen <dwillemsen@google.com> Mon Mar 07 21:05:02 2016 -0800
tree c20e04148251704894f459523c6ceddc038318cd
parent f3af6ce6314a3d32b3b563806a6f990b1af9772a

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

root.bp

diff --git a/root.bp b/root.bp
index d32cf8a..8ba1c12 100644
--- a/root.bp
+++ b/root.bp
@@ -2,20 +2,23 @@
 
 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/*",
 ]