aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorkjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-11-04 12:07:57 +0000
committerkjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-11-04 12:07:57 +0000
commit80174583bda18fad725ac01875a2e0239813cfc3 (patch)
treed0296c8f78c027ed4e2ad17f34a3513da9cf3ce4 /.gitignore
parenta452fc29e66a9755bd0f9facdd101c156eac90a8 (diff)
downloadwebrtc-80174583bda18fad725ac01875a2e0239813cfc3.tar.gz
Replace old resources download script with depot_tools
With help from hinoka@, we're now using a more efficient approach to download only the files that have changed from Google Storge. When uploading new resource files, use upload_to_google_storage.py --bucket chromium-webrtc-resources ./filename which of course requires gsutil authentication setup. NOTICE: Before deploying this, svn:ignore should be removed for the resources folder, or the bots will run into problems with a non-versioned file being found in the checkout during sync (as this CL adds resources to version control). All developers will also need to be informed to wipe their local resources dir to avoid getting an error during checkout due to the already existing non-versioned resources directory. BUG=2294 TEST=locally running gclient runhooks R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2095004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5076 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index c31c886975..381acfac1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,8 @@
/gyp-mac-tool
/net/third_party/nss/
/out
-/resources
+/resources/*.*
+/resources/*/*.*
/talk/examples/android/bin
/talk/examples/android/gen
/talk/examples/android/libs
@@ -99,3 +100,5 @@
/webrtc/video_engine/test/android/obj
/x86-generic_out/
/xcodebuild
+!*.sha1
+