summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorgab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-26 22:26:41 +0000
committergab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-26 22:26:41 +0000
commitc127ae44a93140bc63dd2a423f3571e651474bef (patch)
treeb1491af0fb3bb552063f623bbd06fee30af9c331 /.gitignore
parentd5662a074e77196b267d7a4a631b5ec392390b83 (diff)
downloadchromium_src-c127ae44a93140bc63dd2a423f3571e651474bef.zip
chromium_src-c127ae44a93140bc63dd2a423f3571e651474bef.tar.gz
chromium_src-c127ae44a93140bc63dd2a423f3571e651474bef.tar.bz2
Ignore untracked files caused by bug #119528
chrome/x64 and chrome/ipch were missing from .gitignore (while they shouldn't be created in the first place, they are because of bug #119528) Adding .gitignore entries for every solution building in the wrong place is not viable in the long run (especially that it's only temporary for this bug). When the bug is fixed, we should remove these entries. BUG=119528 TEST= Review URL: http://codereview.chromium.org/9857023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore14
1 files changed, 6 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index a972d69..e75b0af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,11 @@
.gdbinit
.metadata
.project
+# Only /build/(Debug|Release|x64|ipch) should need to be ignored, but bug #119528 makes this global ignore required for now.
+Debug/
+ipch/
+Relase/
+x64/
tags
Thumbs.db
v8.log
@@ -35,7 +40,6 @@ v8.log
/_out
/breakpad/src/
/build/Debug
-/build/Purify
/build/Release
/build/ipch/
/build/util/LASTCHANGE
@@ -44,9 +48,7 @@ v8.log
# The Chrome OS build creates a /c symlink due to http://crbug.com/54866.
/c
/ceee/internal/
-/chrome/Debug
/chrome/Hammer
-/chrome/Release
/chrome/app/policy/cloud_policy_backend_header_compile.xml
/chrome/app/policy/cloud_policy_proto_compile.xml
/chrome/app/theme/google_chrome
@@ -62,17 +64,12 @@ v8.log
/chrome/common/extensions/api/api.xml
/chrome/feedback_proto.xml
/chrome/in_memory_url_index_cache_proto.xml
-# /chrome/installer/(Debug|Release|x64|ipch) should be in the global output directory.
-/chrome/installer/Debug/
-/chrome/installer/Release/
-/chrome/installer/ipch/
/chrome/installer/linux
/chrome/installer/mac/internal
/chrome/installer/mac/third_party/xz/xz
/chrome/installer/mini_installer.xml
/chrome/installer/mini_installer/mini_installer.aps
/chrome/installer/mini_installer_syzygy.xml
-/chrome/installer/x64/
/chrome/installer_util_strings.xml
/chrome/metrics_proto.xml
/chrome/safe_browsing_proto.xml
@@ -102,6 +99,7 @@ v8.log
/googleurl
/gpu/gles2_conform_test
/gyp-mac-tool
+/llvm
/media/yuv_convert_simd_x86.xml
/native_client
/net/Debug