 Chromium Code Reviews
 Chromium Code Reviews Issue 10913083:
  Remove {base,net}_java dependencies from GYP client targets on Android.  (Closed) 
  Base URL: svn://svn.chromium.org/chrome/trunk/src
    
  
    Issue 10913083:
  Remove {base,net}_java dependencies from GYP client targets on Android.  (Closed) 
  Base URL: svn://svn.chromium.org/chrome/trunk/src| 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 # This file is meant to be included into a target to provide a rule | 5 # This file is meant to be included into a target to provide a rule | 
| 6 # to build APK based test suites. | 6 # to build APK based test suites. | 
| 7 # | 7 # | 
| 8 # To use this, create a gyp target with the following form: | 8 # To use this, create a gyp target with the following form: | 
| 9 # { | 9 # { | 
| 10 # 'target_name': 'test_suite_name_apk', | 10 # 'target_name': 'test_suite_name_apk', | 
| 11 # 'type': 'none', | 11 # 'type': 'none', | 
| 12 # 'variables': { | 12 # 'variables': { | 
| 13 # 'test_suite_name': 'test_suite_name', # string | 13 # 'test_suite_name': 'test_suite_name', # string | 
| 14 # 'input_shlib_path' : '/path/to/test_suite.so', # string | 14 # 'input_shlib_path' : '/path/to/test_suite.so', # string | 
| 15 # 'input_jars_paths': ['/path/to/test_suite.jar', ... ], # list | 15 # 'input_jars_paths': ['/path/to/test_suite.jar', ... ], # list | 
| 16 # }, | 16 # }, | 
| 17 # 'includes': ['path/to/this/gypi/file'], | 17 # 'includes': ['path/to/this/gypi/file'], | 
| 18 # } | 18 # } | 
| 19 # | 19 # | 
| 20 | 20 | 
| 21 { | 21 { | 
| 22 'variables': { | 22 'variables': { | 
| 23 'input_jars_paths': [], | 23 'input_jars_paths': [ | 
| 24 # Needed by ChromeNativeTestActivity.java. | |
| 25 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', | |
| 26 ], | |
| 24 }, | 27 }, | 
| 
cjhopman
2012/09/06 20:29:25
Can this be specified as a dependency on base here
 
Philippe
2012/09/07 09:45:57
This does not work unfortunately :/ The Python scr
 
cjhopman
2012/09/07 16:37:01
Depending on base should add the path to chromium_
 | |
| 25 'target_conditions': [ | 28 'target_conditions': [ | 
| 26 ['_toolset == "target"', { | 29 ['_toolset == "target"', { | 
| 27 'conditions': [ | 30 'conditions': [ | 
| 28 ['OS == "android" and gtest_target_type == "shared_library"', { | 31 ['OS == "android" and gtest_target_type == "shared_library"', { | 
| 29 'actions': [{ | 32 'actions': [{ | 
| 30 'action_name': 'apk_<(test_suite_name)', | 33 'action_name': 'apk_<(test_suite_name)', | 
| 31 'message': 'Building <(test_suite_name) test apk.', | 34 'message': 'Building <(test_suite_name) test apk.', | 
| 32 'inputs': [ | 35 'inputs': [ | 
| 33 '<(DEPTH)/testing/android/AndroidManifest.xml', | 36 '<(DEPTH)/testing/android/AndroidManifest.xml', | 
| 34 '<(DEPTH)/testing/android/generate_native_test.py', | 37 '<(DEPTH)/testing/android/generate_native_test.py', | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 66 '-DANDROID_GDBSERVER=<(android_gdbserver)', | 69 '-DANDROID_GDBSERVER=<(android_gdbserver)', | 
| 67 '--ant-args', | 70 '--ant-args', | 
| 68 '-DCHROMIUM_SRC=<(ant_build_out)/../..', | 71 '-DCHROMIUM_SRC=<(ant_build_out)/../..', | 
| 69 ], | 72 ], | 
| 70 }], | 73 }], | 
| 71 }], # 'OS == "android" and gtest_target_type == "shared_library" | 74 }], # 'OS == "android" and gtest_target_type == "shared_library" | 
| 72 ], # conditions | 75 ], # conditions | 
| 73 }], | 76 }], | 
| 74 ], # target_conditions | 77 ], # target_conditions | 
| 75 } | 78 } | 
| OLD | NEW |