diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org> | 2014-09-03 14:34:46 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org> | 2014-09-03 14:34:46 +0000 |
| commit | 0372b93118e789a0d4d43d43e739236723dc6a14 (patch) | |
| tree | aac32f5a987b7e497ef74d3d5f1a80afeaa4817b /webrtc/modules/audio_coding/neteq | |
| parent | bac072667b053f05e822e35255d706e6cbfa39ef (diff) | |
| download | webrtc-0372b93118e789a0d4d43d43e739236723dc6a14.tar.gz | |
Partial revert of r7014 (Android APK refactor)
This reverts selected parts of r7014 to enable
rolling WebRTC in Chromium DEPS.
This works around the problem with GYP includes
being processed in the first pass (i.e. variables
cannot be used for paths). Using a dependency with
a path using a variable that is conditioned for
build_with_chromium being 0 or 1 solves the Chromium
build.
These changes will be restored once I've finished
a major GYP refactoring that will break out all
test related code (at least the parts that includes
the Android APK targets) into a separate chain
of GYP targets that are not processed when generating
projects for Chromium (which is why r7014 is breaking
the Chromium build).
BUG=3741
TESTED=Passing compilation of standalone using:
GYP_DEFINES="OS=android component=static_library fastbuild=1 target_arch=arm" webrtc/build/gyp_webrtc
ninja -C out/Debug
Then verified the *_apk targets are generated and compiled.
Passing compilation from a Chromium checkout with third_party/webrtc
directory removed and a new empty third_party/webrtc mapped to the
standalone checkout using:
sudo mount --bind /path/to/trunk/webrtc third_party/webrtc
Then running build/gyp_chromium
I also verified WebRTC GYP targets exist and are able to compile.
R=henrike@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/20299004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7040 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules/audio_coding/neteq')
| -rw-r--r-- | webrtc/modules/audio_coding/neteq/neteq.gypi | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/webrtc/modules/audio_coding/neteq/neteq.gypi b/webrtc/modules/audio_coding/neteq/neteq.gypi index 2bdb359a12..01143bc5ee 100644 --- a/webrtc/modules/audio_coding/neteq/neteq.gypi +++ b/webrtc/modules/audio_coding/neteq/neteq.gypi @@ -201,17 +201,10 @@ ['OS=="android"', { 'targets': [ { - 'target_name': 'audio_decoder_unittests_apk', + 'target_name': 'audio_decoder_unittests_apk_target', 'type': 'none', - 'variables': { - 'test_suite_name': 'audio_decoder_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)audio_decoder_unittests<(SHARED_LIB_SUFFIX)', - }, 'dependencies': [ - 'audio_decoder_unittests', - ], - 'includes': [ - '../../../../build/apk_test.gypi', + '<(apk_tests_path):audio_decoder_unittests_apk', ], }, ], |