From 71ea9c13c90b2c5bfefd196caa442777eb0f8ce2 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Mon, 7 Mar 2016 20:56:24 -0800
Subject: 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 | 11 +++++++----
 1 file 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/*",
 ]
-- 
cgit v1.2.3