diff options
| author | Shinichiro Hamaji <hamaji@google.com> | 2016-02-28 04:40:46 +0000 |
|---|---|---|
| committer | Shinichiro Hamaji <hamaji@google.com> | 2016-02-28 04:40:46 +0000 |
| commit | 086b17663573f0d2742c534885a787c6d98216b9 (patch) | |
| tree | 5618f6c181f4685b721fb141b59dfbbd691ce12b /testcase/ninja_mkdir.sh | |
| parent | 59ce30d7b247cfc41950e2cc5438a1bff66bdc1f (diff) | |
| download | android_build_kati-086b17663573f0d2742c534885a787c6d98216b9.tar.gz android_build_kati-086b17663573f0d2742c534885a787c6d98216b9.tar.bz2 android_build_kati-086b17663573f0d2742c534885a787c6d98216b9.zip | |
Revert "Merge remote-tracking branch 'aosp/upstream'"
This reverts commit 59ce30d7b247cfc41950e2cc5438a1bff66bdc1f.
This looks the culprit of b/27381403. As I haven't figured out
the cause yet, let's just revert this for now.
Bug: 27381403
Change-Id: Ifd25a24b4bd7f2922ce76d6a05f85723074848ea
Diffstat (limited to 'testcase/ninja_mkdir.sh')
| -rw-r--r-- | testcase/ninja_mkdir.sh | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/testcase/ninja_mkdir.sh b/testcase/ninja_mkdir.sh deleted file mode 100644 index e54298d..0000000 --- a/testcase/ninja_mkdir.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# Copyright 2016 Google Inc. All rights reserved -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http:#www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e - -log=/tmp/log -mk="$@" - -cat <<EOF > Makefile -test: a/b - -a/b: - @mkdir -p \$(dir \$@) - touch \$@ -EOF - -${mk} 2> ${log} -if [ -e ninja.sh ]; then - ./ninja.sh -fi -if [[ ! -d a ]]; then - echo "Created 'a'" -fi -if [ -e ninja.sh ]; then - if grep -q "mkdir -p" build.ninja; then - echo "Should not include 'mkdir -p' in build.ninja" - echo "Ninja will automatically create this directory" - fi -fi |