| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'devtools_bridge_javalib', | 8 'target_name': 'devtools_bridge_javalib', |
| 9 'type': 'none', | 9 'type': 'none', |
| 10 'variables': { | 10 'variables': { |
| 11 'java_in_dir': 'devtools_bridge/android/java', | 11 'java_in_dir': 'devtools_bridge/android/java', |
| 12 }, | 12 }, |
| 13 'includes': [ '../build/java.gypi' ], | 13 'includes': [ '../build/java.gypi' ], |
| 14 'dependencies': [ | 14 'dependencies': [ |
| 15 '../third_party/android_tools/android_tools.gyp:android_gcm', | |
| 16 '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection_javalib
', | 15 '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection_javalib
', |
| 17 ], | 16 ], |
| 18 }, | 17 }, |
| 19 { | 18 { |
| 20 'target_name': 'devtools_bridge_testutils', | 19 'target_name': 'devtools_bridge_testutils', |
| 21 'type': 'none', | 20 'type': 'none', |
| 22 'variables': { | 21 'variables': { |
| 23 'java_in_dir': 'devtools_bridge/test/android/javatests', | 22 'java_in_dir': 'devtools_bridge/test/android/javatests', |
| 24 }, | 23 }, |
| 25 'includes': [ '../build/java.gypi' ], | 24 'includes': [ '../build/java.gypi' ], |
| (...skipping 13 matching lines...) Expand all Loading... |
| 39 'apk_name': 'DevToolsBridgeTest', | 38 'apk_name': 'DevToolsBridgeTest', |
| 40 'test_suite_name': 'devtools_bridge_tests', | 39 'test_suite_name': 'devtools_bridge_tests', |
| 41 'java_in_dir': 'devtools_bridge/android/javatests', | 40 'java_in_dir': 'devtools_bridge/android/javatests', |
| 42 'native_lib_target': 'libjingle_peerconnection_so', | 41 'native_lib_target': 'libjingle_peerconnection_so', |
| 43 'is_test_apk': 1, | 42 'is_test_apk': 1, |
| 44 }, | 43 }, |
| 45 'includes': [ '../build/java_apk.gypi' ], | 44 'includes': [ '../build/java_apk.gypi' ], |
| 46 }, | 45 }, |
| 47 ], | 46 ], |
| 48 } | 47 } |
| OLD | NEW |