diff options
| -rw-r--r-- | all.gyp | 8 | ||||
| -rw-r--r-- | talk/build/common.gypi | 6 |
2 files changed, 7 insertions, 7 deletions
@@ -8,7 +8,7 @@ { 'variables': { - 'talk_root%': '<(DEPTH)/talk', + 'libjingle_root%': '<(DEPTH)', }, 'targets': [ { @@ -17,9 +17,9 @@ 'dependencies': [ 'third_party/openmax_dl/dl/dl.gyp:*', 'webrtc/webrtc.gyp:*', - '<(talk_root)/libjingle.gyp:*', - '<(talk_root)/libjingle_examples.gyp:*', - '<(talk_root)/libjingle_tests.gyp:*', + '<(libjingle_root)/talk/libjingle.gyp:*', + '<(libjingle_root)/talk/libjingle_examples.gyp:*', + '<(libjingle_root)/talk/libjingle_tests.gyp:*', ], 'conditions': [ ['OS=="android"', { diff --git a/talk/build/common.gypi b/talk/build/common.gypi index 85d2f58714..8261c2085e 100644 --- a/talk/build/common.gypi +++ b/talk/build/common.gypi @@ -30,8 +30,8 @@ { 'variables': { 'webrtc_root%': '<(DEPTH)/webrtc', - # TODO(ronghuawu): Chromium build will need a different talk_root. - 'talk_root%': '<(DEPTH)/talk', + # TODO(ronghuawu): Chromium build will need a different libjingle_root. + 'libjingle_root%': '<(DEPTH)', # TODO(ronghuawu): For now, disable the Chrome plugins, which causes a # flood of chromium-style warnings. 'clang_use_chrome_plugins%': 0, @@ -46,7 +46,7 @@ }, 'target_defaults': { 'include_dirs': [ - '<(talk_root)/..', + '<(libjingle_root)', '<(DEPTH)', '../../third_party', '../../third_party/webrtc', |