| 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 'conditions': [ | 6 'conditions': [ |
| 7 ['OS=="android"', { | 7 ['OS=="android"', { |
| 8 # TODO(mef): Figure out what needs to be done for gn script. | 8 # TODO(mef): Figure out what needs to be done for gn script. |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 'type': 'none', | 314 'type': 'none', |
| 315 'dependencies': [ | 315 'dependencies': [ |
| 316 'cronet_java', | 316 'cronet_java', |
| 317 'cronet_sample_apk_java', | 317 'cronet_sample_apk_java', |
| 318 'cronet_api', | 318 'cronet_api', |
| 319 '../base/base.gyp:base_java_test_support', | 319 '../base/base.gyp:base_java_test_support', |
| 320 ], | 320 ], |
| 321 'variables': { | 321 'variables': { |
| 322 'apk_name': 'CronetSampleTest', | 322 'apk_name': 'CronetSampleTest', |
| 323 'java_in_dir': 'cronet/android/sample/javatests', | 323 'java_in_dir': 'cronet/android/sample/javatests', |
| 324 'resource_dir': 'cronet/android/sample/res', | |
| 325 'is_test_apk': 1, | 324 'is_test_apk': 1, |
| 326 }, | 325 }, |
| 327 'includes': [ '../build/java_apk.gypi' ], | 326 'includes': [ '../build/java_apk.gypi' ], |
| 328 }, | 327 }, |
| 329 { | 328 { |
| 330 'target_name': 'cronet_tests_jni_headers', | 329 'target_name': 'cronet_tests_jni_headers', |
| 331 'type': 'none', | 330 'type': 'none', |
| 332 'sources': [ | 331 'sources': [ |
| 333 'cronet/android/test/src/org/chromium/net/CronetTestUtil.java', | 332 'cronet/android/test/src/org/chromium/net/CronetTestUtil.java', |
| 334 'cronet/android/test/src/org/chromium/net/MockUrlRequestJobFactory.j
ava', | 333 'cronet/android/test/src/org/chromium/net/MockUrlRequestJobFactory.j
ava', |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 584 }, | 583 }, |
| 585 ], | 584 ], |
| 586 }, | 585 }, |
| 587 ], | 586 ], |
| 588 'variables': { | 587 'variables': { |
| 589 'enable_data_reduction_proxy_support%': 0, | 588 'enable_data_reduction_proxy_support%': 0, |
| 590 }, | 589 }, |
| 591 }], # OS=="android" | 590 }], # OS=="android" |
| 592 ], | 591 ], |
| 593 } | 592 } |
| OLD | NEW |