commit 165c01e383437f80e0cd1fed789228def016cb75
author Dan Willemsen <dwillemsen@google.com> Fri Apr 22 00:41:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 22 00:41:46 2016 +0000
tree 4e29b6f1b40627e4727c72fa5417fabf7e21cea9
parent 67fc9b6e75d75e8dbdc8254a50339c8babba9a9a
parent 767484995a2cb488db8a2b2b6c72d25d53a9af7a

Build Ninja with Soong
am: 767484995a

* commit '767484995a2cb488db8a2b2b6c72d25d53a9af7a':
  Build Ninja with Soong

Change-Id: I9db6696b0a9efed8ffe9dcf4f138c8556402a46a

build-prebuilts.sh

diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index 26b336b..ee2608a 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -24,9 +24,6 @@
 if [ -d ${TOP}/toolchain/go ]; then
     build_go=1
 fi
-if [ -d ${TOP}/external/ninja ]; then
-    build_ninja=1
-fi
 
 if [ -n ${build_soong} ]; then
     # ckati and makeparallel (Soong)
@@ -47,22 +44,12 @@
 }
 EOF
     BUILDDIR=${SOONG_OUT} ./bootstrap.bash
-    ${SOONG_OUT}/soong ${SOONG_HOST_OUT}/bin/ckati ${SOONG_HOST_OUT}/bin/makeparallel
+    ${SOONG_OUT}/soong ${SOONG_HOST_OUT}/bin/ckati ${SOONG_HOST_OUT}/bin/makeparallel ${SOONG_HOST_OUT}/bin/ninja ${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test
     (
         cd ${SOONG_HOST_OUT}
         zip -qryX build-prebuilts.zip bin/ lib*/
     )
-fi
-
-# Ninja
-if [ -n ${build_ninja} ]; then
-    NINJA_OUT=${OUT_DIR}/obj/ninja
-    rm -rf ${NINJA_OUT}
-    mkdir -p ${NINJA_OUT}
-    (
-        cd ${NINJA_OUT}
-        ${TOP}/external/ninja/configure.py --bootstrap
-    )
+    ${SOONG_HOST_OUT}/nativetest64/ninja_test/ninja_test
 fi
 
 # Go
@@ -91,9 +78,6 @@
     if [ -n ${build_soong} ]; then
         cp ${SOONG_HOST_OUT}/build-prebuilts.zip ${DIST_DIR}/
     fi
-    if [ -n ${build_ninja} ]; then
-        cp ${NINJA_OUT}/ninja ${DIST_DIR}/
-    fi
     if [ -n ${build_go} ]; then
         cp ${GO_OUT}/go.zip ${DIST_DIR}/
     fi