From 703c93691faa1db3050e8ed4f49bd1bf5151410f Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Mon, 10 Oct 2016 16:25:51 -0700
Subject: [PATCH] Move build/ to build/make/

Remove the nesting of build/{blueprint,kati,soong}, which should allow
us to use submodules.

Bug: 28001743
Test: Compare build-aosp_arm.ninja before/after
Change-Id: I5ff919cdb0423ebd11d9033fadab8aedf1a8b81d
---
 default.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 4b79fad..700c414 100644
--- a/default.xml
+++ b/default.xml
@@ -8,8 +8,14 @@
            remote="aosp"
            sync-j="4" />
 
-  <project path="build" name="platform/build" groups="pdk" >
+  <project path="build/make" name="platform/build" groups="pdk" >
     <copyfile src="core/root.mk" dest="Makefile" />
+    <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
+    <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
+    <linkfile src="core" dest="build/core" />
+    <linkfile src="envsetup.sh" dest="build/envsetup.sh" />
+    <linkfile src="target" dest="build/target" />
+    <linkfile src="tools" dest="build/tools" />
   </project>
   <project path="build/blueprint" name="platform/build/blueprint" groups="pdk,tradefed" />
   <project path="build/kati" name="platform/build/kati" groups="pdk,tradefed" />