From 7dbca422d49a23cacfca6960da1e3b2b0517b267 Mon Sep 17 00:00:00 2001 From: "ivan.penkov@gmail.com" Date: Thu, 10 Apr 2014 17:37:20 +0000 Subject: [PATCH] Moving directory 'build' one level up as it collides with a file named 'BUILD' which happens to be in that same location in the Google source depot. R=chrisha@chromium.org, mark@chromium.org Review URL: https://breakpad.appspot.com/1504002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1308 4c0a9323-5329-0410-9bdc-e9ce6186880e --- {build => src/build}/common.gypi | 0 {build => src/build}/external_code.gypi | 0 {build => src/build}/internal/release_defaults.gypi | 0 {build => src/build}/internal/release_impl.gypi | 0 {build => src/build}/internal/release_impl_official.gypi | 0 {build => src/build}/release.gypi | 0 src/client/windows/breakpad_client.gyp | 2 +- src/client/windows/crash_generation/crash_generation.gyp | 2 +- src/client/windows/handler/exception_handler.gyp | 2 +- src/client/windows/sender/crash_report_sender.gyp | 2 +- .../windows/tests/crash_generation_app/crash_generation_app.gyp | 2 +- src/client/windows/unittests/client_tests.gyp | 2 +- src/client/windows/unittests/testing.gyp | 2 +- src/common/windows/common_windows.gyp | 2 +- src/tools/windows/dump_syms/dump_syms.gyp | 2 +- src/tools/windows/symupload/symupload.gyp | 2 +- 16 files changed, 10 insertions(+), 10 deletions(-) rename {build => src/build}/common.gypi (100%) rename {build => src/build}/external_code.gypi (100%) rename {build => src/build}/internal/release_defaults.gypi (100%) rename {build => src/build}/internal/release_impl.gypi (100%) rename {build => src/build}/internal/release_impl_official.gypi (100%) rename {build => src/build}/release.gypi (100%) diff --git a/build/common.gypi b/src/build/common.gypi similarity index 100% rename from build/common.gypi rename to src/build/common.gypi diff --git a/build/external_code.gypi b/src/build/external_code.gypi similarity index 100% rename from build/external_code.gypi rename to src/build/external_code.gypi diff --git a/build/internal/release_defaults.gypi b/src/build/internal/release_defaults.gypi similarity index 100% rename from build/internal/release_defaults.gypi rename to src/build/internal/release_defaults.gypi diff --git a/build/internal/release_impl.gypi b/src/build/internal/release_impl.gypi similarity index 100% rename from build/internal/release_impl.gypi rename to src/build/internal/release_impl.gypi diff --git a/build/internal/release_impl_official.gypi b/src/build/internal/release_impl_official.gypi similarity index 100% rename from build/internal/release_impl_official.gypi rename to src/build/internal/release_impl_official.gypi diff --git a/build/release.gypi b/src/build/release.gypi similarity index 100% rename from build/release.gypi rename to src/build/release.gypi diff --git a/src/client/windows/breakpad_client.gyp b/src/client/windows/breakpad_client.gyp index 0c52d86e..64797534 100644 --- a/src/client/windows/breakpad_client.gyp +++ b/src/client/windows/breakpad_client.gyp @@ -28,7 +28,7 @@ { 'includes': [ - '../../../build/common.gypi', + '../../build/common.gypi', ], 'targets': [ { diff --git a/src/client/windows/crash_generation/crash_generation.gyp b/src/client/windows/crash_generation/crash_generation.gyp index 3293110f..ba343768 100644 --- a/src/client/windows/crash_generation/crash_generation.gyp +++ b/src/client/windows/crash_generation/crash_generation.gyp @@ -28,7 +28,7 @@ { 'includes': [ - '../../../../build/common.gypi', + '../../../build/common.gypi', ], 'targets': [ { diff --git a/src/client/windows/handler/exception_handler.gyp b/src/client/windows/handler/exception_handler.gyp index 5d052d0c..c5733277 100644 --- a/src/client/windows/handler/exception_handler.gyp +++ b/src/client/windows/handler/exception_handler.gyp @@ -28,7 +28,7 @@ { 'includes': [ - '../../../../build/common.gypi', + '../../../build/common.gypi', ], 'targets': [ { diff --git a/src/client/windows/sender/crash_report_sender.gyp b/src/client/windows/sender/crash_report_sender.gyp index f87824b1..dc8583a0 100644 --- a/src/client/windows/sender/crash_report_sender.gyp +++ b/src/client/windows/sender/crash_report_sender.gyp @@ -28,7 +28,7 @@ { 'includes': [ - '../../../../build/common.gypi', + '../../../build/common.gypi', ], 'targets': [ { diff --git a/src/client/windows/tests/crash_generation_app/crash_generation_app.gyp b/src/client/windows/tests/crash_generation_app/crash_generation_app.gyp index 690898dd..3ce307da 100644 --- a/src/client/windows/tests/crash_generation_app/crash_generation_app.gyp +++ b/src/client/windows/tests/crash_generation_app/crash_generation_app.gyp @@ -28,7 +28,7 @@ { 'includes': [ - '../../../../../build/common.gypi', + '../../../../build/common.gypi', ], 'targets': [ { diff --git a/src/client/windows/unittests/client_tests.gyp b/src/client/windows/unittests/client_tests.gyp index 034c130a..ba1b3d20 100644 --- a/src/client/windows/unittests/client_tests.gyp +++ b/src/client/windows/unittests/client_tests.gyp @@ -28,7 +28,7 @@ { 'includes': [ - '../../../../build/common.gypi', + '../../../build/common.gypi', ], 'targets': [ { diff --git a/src/client/windows/unittests/testing.gyp b/src/client/windows/unittests/testing.gyp index 02d98ded..141d0ed0 100644 --- a/src/client/windows/unittests/testing.gyp +++ b/src/client/windows/unittests/testing.gyp @@ -28,7 +28,7 @@ { 'includes': [ - '../../../../build/common.gypi', + '../../../build/common.gypi', ], 'target_defaults': { }, diff --git a/src/common/windows/common_windows.gyp b/src/common/windows/common_windows.gyp index 47336589..aadc21a7 100644 --- a/src/common/windows/common_windows.gyp +++ b/src/common/windows/common_windows.gyp @@ -28,7 +28,7 @@ { 'includes': [ - '../../../build/common.gypi', + '../../build/common.gypi', ], 'targets': [ { diff --git a/src/tools/windows/dump_syms/dump_syms.gyp b/src/tools/windows/dump_syms/dump_syms.gyp index f60c1bff..b815574b 100644 --- a/src/tools/windows/dump_syms/dump_syms.gyp +++ b/src/tools/windows/dump_syms/dump_syms.gyp @@ -28,7 +28,7 @@ { 'includes': [ - '../../../../build/common.gypi', + '../../../build/common.gypi', ], 'targets': [ { diff --git a/src/tools/windows/symupload/symupload.gyp b/src/tools/windows/symupload/symupload.gyp index 71c50890..d7e5fb7b 100644 --- a/src/tools/windows/symupload/symupload.gyp +++ b/src/tools/windows/symupload/symupload.gyp @@ -28,7 +28,7 @@ { 'includes': [ - '../../../../build/common.gypi', + '../../../build/common.gypi', ], 'targets': [ {