| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'targets': [ | 8 'targets': [ |
| 9 { | 9 { |
| 10 'target_name': 'native_test_apk', | 10 'target_name': 'native_test_apk', |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 'outputs': [ | 24 'outputs': [ |
| 25 # Awkwardly, we build a Debug APK even when gyp is in | 25 # Awkwardly, we build a Debug APK even when gyp is in |
| 26 # Release mode. I don't think it matters (e.g. we're | 26 # Release mode. I don't think it matters (e.g. we're |
| 27 # probably happy to not codesign) but naming should be | 27 # probably happy to not codesign) but naming should be |
| 28 # fixed. The -debug name is an aspect of the android | 28 # fixed. The -debug name is an aspect of the android |
| 29 # SDK antfiles (e.g. ${sdk.dir}/tools/ant/build.xml) | 29 # SDK antfiles (e.g. ${sdk.dir}/tools/ant/build.xml) |
| 30 '<(PRODUCT_DIR)/ChromeNativeTests-debug.apk', | 30 '<(PRODUCT_DIR)/ChromeNativeTests-debug.apk', |
| 31 ], | 31 ], |
| 32 'action': [ | 32 'action': [ |
| 33 'ant', | 33 'ant', |
| 34 '-DPRODUCT_DIR=<(PRODUCT_DIR)', | 34 '-DPRODUCT_DIR=<(ant_build_out)', |
| 35 '-buildfile', | 35 '-buildfile', |
| 36 '<(DEPTH)/testing/android/native_test_apk.xml', | 36 '<(DEPTH)/testing/android/native_test_apk.xml', |
| 37 ] | 37 ] |
| 38 } | 38 } |
| 39 ], | 39 ], |
| 40 }, | 40 }, |
| 41 { | 41 { |
| 42 'target_name': 'native_test_native_code', | 42 'target_name': 'native_test_native_code', |
| 43 'message': 'building native pieces of native test package', | 43 'message': 'building native pieces of native test package', |
| 44 'type': 'static_library', | 44 'type': 'static_library', |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 'direct_dependent_settings': { | 87 'direct_dependent_settings': { |
| 88 'include_dirs': [ | 88 'include_dirs': [ |
| 89 '<(SHARED_INTERMEDIATE_DIR)', | 89 '<(SHARED_INTERMEDIATE_DIR)', |
| 90 ], | 90 ], |
| 91 }, | 91 }, |
| 92 }, | 92 }, |
| 93 ], | 93 ], |
| 94 }] | 94 }] |
| 95 ], | 95 ], |
| 96 } | 96 } |
| OLD | NEW |