| 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 24 matching lines...) Expand all Loading... |
| 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', |
| 45 'sources': [ | 45 'sources': [ |
| 46 'native_test_launcher.cc', | 46 'native_test_launcher.cc', |
| 47 ], | 47 ], |
| 48 'direct_dependent_settings': { | 48 'direct_dependent_settings': { |
| 49 'ldflags!': [ | 49 'ldflags!': [ |
| 50 # JNI_OnLoad is implemented in a .a and we need to | 50 # JNI_OnLoad is implemented in a .a and we need to |
| 51 # re-export in the .so. | 51 # re-export in the .so. |
| 52 '-Wl,--exclude-libs=ALL', | 52 '-Wl,--exclude-libs=ALL', |
| 53 ], | 53 ], |
| 54 }, | 54 }, |
| 55 'dependencies': [ | 55 'dependencies': [ |
| 56 'jni_headers', | |
| 57 '../../base/base.gyp:base', | 56 '../../base/base.gyp:base', |
| 58 '../../base/base.gyp:test_support_base', | 57 '../../base/base.gyp:test_support_base', |
| 59 '../gtest.gyp:gtest', | 58 '../gtest.gyp:gtest', |
| 59 'native_test_jni_headers', |
| 60 ], | 60 ], |
| 61 }, | 61 }, |
| 62 { | 62 { |
| 63 'target_name': 'jni_headers', | 63 'target_name': 'native_test_jni_headers', |
| 64 'type': 'none', | 64 'type': 'none', |
| 65 'actions': [ | 65 'actions': [ |
| 66 { | 66 { |
| 67 'action_name': 'generate_jni_headers', | 67 'action_name': 'generate_jni_headers', |
| 68 'inputs': [ | 68 'inputs': [ |
| 69 '../../base/android/jni_generator/jni_generator.py', | 69 '../../base/android/jni_generator/jni_generator.py', |
| 70 'java/src/org/chromium/native_test/ChromeNativeTestActivity.java
' | 70 'java/src/org/chromium/native_test/ChromeNativeTestActivity.java
' |
| 71 ], | 71 ], |
| 72 'outputs': [ | 72 'outputs': [ |
| 73 '<(SHARED_INTERMEDIATE_DIR)/testing/android/jni/' | 73 '<(SHARED_INTERMEDIATE_DIR)/testing/android/jni/' |
| (...skipping 13 matching lines...) Expand all 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 |