aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorkjellander@webrtc.org <kjellander@webrtc.org>2014-09-01 11:06:37 +0000
committerkjellander@webrtc.org <kjellander@webrtc.org>2014-09-01 11:06:37 +0000
commit3bd4156d75b12c084026e8e31c12fd4b982374d3 (patch)
tree3d761e31876c0c89adb06cb6e74a3906de81f791 /.gitignore
parentc4870bb221f9d28b00d498f5ef5558d5330d2743 (diff)
downloadwebrtc-3bd4156d75b12c084026e8e31c12fd4b982374d3.tar.gz
Android APK tests built from a normal WebRTC checkout.
Restructure how the Android APK tests are compiled now that we have a Chromium checkout available (since r6938). This removes the need of several hacks that were needed when building these targets from inside a Chromium checkout. By creating a symlink to Chromium's base we can compile the required targets. This also removes the need of the previously precompiled binaries we keep in /deps/tools/android at Google code. All the user needs to do is to add the target_os = ["android"] entry to his .gclient as described at https://code.google.com/p/chromium/wiki/AndroidBuildInstructions Before committing this CL, the Android APK buildbots will need to be updated. This also solves http://crbug.com/402594 since the apply_svn_patch.py usage will be similar to the other standalone bots. It also solves http://crbug.com/399297 BUG=chromium:399297, chromium:402594 TESTED=Locally compiled all APK targets by running: GYP_DEFINES="OS=android include_tests=1 enable_tracing=1" gclient runhooks ninja -C out/Release checkdeps R=henrike@webrtc.org, tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/22149004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7014 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 2535251c5e..f1490c5f15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@
.settings
.sw?
/Makefile
+/base
/build
/buildtools
/chromium/.gclient.bot
@@ -94,8 +95,8 @@
/third_party/valgrind
/third_party/winsdk_samples/src
/third_party/yasm
+/third_party/zlib
/tools/android
-/tools/android-dummy-test
/tools/clang
/tools/find_depot_tools.py
/tools/generate_library_loader