diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-02 19:31:16 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-02 19:31:16 +0000 |
| commit | 22a2893404a85db69b21c17ed3510456acf767f0 (patch) | |
| tree | cd6924947ee970f446fd55f8bbd859027dd905b9 /voice_engine/voice_engine.gyp | |
| parent | 1b5923498520c640533b4d11ffe7bf2622f7d89d (diff) | |
| download | webrtc-22a2893404a85db69b21c17ed3510456acf767f0.tar.gz | |
Fix include of isolate.gypi
Recent changes in GYP seem to have broken our previous
"hack" for getting the GYP rule for .isolate files
imported from the Chromium build/isolate.gypi.
The best solution for now is to remove the hack
and check in a copy of Chromium's src/build/isolate.gypi
in WebRTC's build/ dir instead. A similar approach is
used for our build/protoc.gypi file.
TEST=On Linux, I successfully ran:
gclient runhooks
ninja -C out/Release
and verified a bunch of .isolated files were created in
out/Release (which didn't happen before this patch).
I also renamed the build/isolate.gypi from Chromium to
ensure that our own is used and not that one (in case any
paths would be incorrect).
I also ran build/gyp_chromium in a Chromium checkout
with WebRTC in third_party/webrtc having this patch applied
to ensure GYP processing was still working.
Finally, I verified that the same project generation and
compilation from a Chromium checkout worked the way we build
our Android native tests, using:
. build/android/envsetup.sh
GYP_DEFINES="$GYP_DEFINES include_tests=1 enable_tracing=1" gclient runhooks
ninja -C out/Release android_builder_webrtc
BUG=1916
R=andrew@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2338004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4907 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/voice_engine.gyp')
| -rw-r--r-- | voice_engine/voice_engine.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/voice_engine/voice_engine.gyp b/voice_engine/voice_engine.gyp index 34070fab..5e000778 100644 --- a/voice_engine/voice_engine.gyp +++ b/voice_engine/voice_engine.gyp @@ -303,10 +303,10 @@ 'target_name': 'voice_engine_unittests_run', 'type': 'none', 'dependencies': [ - '<(import_isolate_path):import_isolate_gypi', 'voice_engine_unittests', ], 'includes': [ + '../build/isolate.gypi', 'voice_engine_unittests.isolate', ], 'sources': [ @@ -317,10 +317,10 @@ 'target_name': 'voe_auto_test_run', 'type': 'none', 'dependencies': [ - '<(import_isolate_path):import_isolate_gypi', 'voe_auto_test', ], 'includes': [ + '../build/isolate.gypi', 'voe_auto_test.isolate', ], 'sources': [ |