diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-02-11 17:43:19 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-02-11 17:43:19 +0000 |
| commit | 18a21a03c6cedb41e2dea377240221611d3dfcb1 (patch) | |
| tree | b27cc717cab372ff8bfb55d162209c7e3ff136ea /.gitignore | |
| parent | 00ab7cf4fd83b9031325b8e67de606becf4ad920 (diff) | |
| download | webrtc-18a21a03c6cedb41e2dea377240221611d3dfcb1.tar.gz | |
Android NDK build tools
This CL enables building with Android NDK in the way that Chromium buildbots do it.
== Overview ==
* Add Android dependencies to DEPS (SDK, NDK, Android test runner). This also makes it possible to use Android's build/android/run_tests.py script to execute tests on Android devices.
* Add a Python script to build the WebRTC Video demo for Android using ndk-build and Ant. This is designed as an annotation script for Buildbots but is also fine to run locally.
* Update Android.mk so it works with the compiler output from a build performed by build/android/buildbot/bb_run_bot.py (which is how Chrome buildbots build).
== Syncing Android dependencies ==
To get the dependencies added in DEPS synced out, you must change the last line
of your .gclient file to look like this:
];target_os = ["android"]
That will append another variable to the .gclient file that causes these
dependencies to be synced during gclient sync.
If you want to get additional platform-specific dependencies in the same
checkout, add them to the list too, e.g. target_os = ["android", "unix"].
== Android.mk ==
The fix in Android.mk is needed since Chrome is building using build/android/buildbot/bb_run_bot.py, which only output the libraries into out/Debug. With the change it works for both that and a normal build (which copies the library files from out/Debug/obj.target/subpath to out/Debug anyway as a part of the build).
== svn:ignore ==
NOTICE: Before submitting, the following directories should be added to svn:ignore in third_party to avoid them from being removed and re-synced for every build:
* android_testrunner
* android_tools
* WebKit
This has to be done in a manual SVN commit since it's not possible to include in a git-svn CL (and I don't want to migrate this to a SVN CL).
BUG=none
TEST=local builds
Review URL: https://webrtc-codereview.appspot.com/1024009
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3497 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index d5d64cdb8f..ff7a557f73 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,8 @@ /out /resources /testing +/third_party/android_testrunner +/third_party/android_tools /third_party/asan /third_party/cygwin /third_party/directxsdk @@ -62,13 +64,16 @@ /third_party/valgrind /third_party/winsdk_samples/src /third_party/yasm +/third_party/WebKit/Tools/Scripts /tools/clang /tools/gyp /tools/python /tools/valgrind /tools/win /webrtc/supplement.gypi -/webrtc/video_engine/main/test/android_test/bin -/webrtc/video_engine/main/test/android_test/gen +/webrtc/video_engine/test/android/bin +/webrtc/video_engine/test/android/gen +/webrtc/video_engine/test/android/libs +/webrtc/video_engine/test/android/obj /x86-generic_out/ /xcodebuild |