| Index: build/all.gyp
|
| diff --git a/build/all.gyp b/build/all.gyp
|
| index f562537cd815ee63a23a124f8219f04bbcb22e51..b469a2220307a9a576a8291eb88d9121f7cef67e 100644
|
| --- a/build/all.gyp
|
| +++ b/build/all.gyp
|
| @@ -806,7 +806,6 @@
|
| '../chrome/chrome.gyp:chrome_shell_uiautomator_tests',
|
| '../chrome/chrome.gyp:unit_tests_apk',
|
| '../components/components_tests.gyp:components_unittests_apk',
|
| - '../components/devtools_bridge.gyp:devtools_bridge_tests_apk',
|
| '../content/content_shell_and_tests.gyp:content_browsertests_apk',
|
| '../content/content_shell_and_tests.gyp:content_gl_tests_apk',
|
| '../content/content_shell_and_tests.gyp:content_unittests_apk',
|
| @@ -825,6 +824,13 @@
|
| '../ui/events/events.gyp:events_unittests_apk',
|
| '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
|
| ],
|
| + 'conditions': [
|
| + ['"<(libpeer_target_type)"=="static_library"', {
|
| + 'dependencies': [
|
| + '../components/devtools_bridge.gyp:devtools_bridge_tests_apk',
|
| + ],
|
| + }],
|
| + ],
|
| },
|
| {
|
| # WebRTC Chromium tests to run on Android.
|
| @@ -838,13 +844,6 @@
|
| # Unit test bundles packaged as an apk.
|
| '../content/content_shell_and_tests.gyp:content_browsertests_apk',
|
| ],
|
| - 'conditions': [
|
| - ['"<(libpeer_target_type)"=="static_library"', {
|
| - 'dependencies': [
|
| - '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection_javalib',
|
| - ],
|
| - }],
|
| - ],
|
| }, # target_name: android_builder_chromium_webrtc
|
| ], # targets
|
| }], # OS="android"
|
|
|