| 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 import("//base/android/linker/config.gni") | 5 import("//base/android/linker/config.gni") | 
| 6 import("//build/config/android/config.gni") | 6 import("//build/config/android/config.gni") | 
| 7 import("//build/config/android/internal_rules.gni") | 7 import("//build/config/android/internal_rules.gni") | 
| 8 import("//build/config/sanitizers/sanitizers.gni") | 8 import("//build/config/sanitizers/sanitizers.gni") | 
| 9 import("//build/toolchain/toolchain.gni") | 9 import("//build/toolchain/toolchain.gni") | 
| 10 import("//third_party/android_platform/config.gni") | 10 import("//third_party/android_platform/config.gni") | 
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 59       rebase_path(depfile, root_build_dir), | 59       rebase_path(depfile, root_build_dir), | 
| 60       "--input_file={{source}}", | 60       "--input_file={{source}}", | 
| 61       "--optimize_generation=1", | 61       "--optimize_generation=1", | 
| 62       "--ptr_type=long", | 62       "--ptr_type=long", | 
| 63       "--output_dir", | 63       "--output_dir", | 
| 64       rebase_path(jni_output_dir, root_build_dir), | 64       rebase_path(jni_output_dir, root_build_dir), | 
| 65       "--includes", | 65       "--includes", | 
| 66       rebase_path(jni_generator_include, jni_output_dir), | 66       rebase_path(jni_generator_include, jni_output_dir), | 
| 67       "--native_exports_optional", | 67       "--native_exports_optional", | 
| 68     ] | 68     ] | 
| 69     if (defined(invoker.jni_generator_jarjar_file)) { |  | 
| 70       args += [ |  | 
| 71         "--jarjar", |  | 
| 72         rebase_path(jni_generator_jarjar_file, root_build_dir), |  | 
| 73       ] |  | 
| 74     } |  | 
| 75   } | 69   } | 
| 76 | 70 | 
| 77   config("jni_includes_${target_name}") { | 71   config("jni_includes_${target_name}") { | 
| 78     # TODO(cjhopman): #includes should probably all be relative to | 72     # TODO(cjhopman): #includes should probably all be relative to | 
| 79     # base_output_dir. Remove that from this config once the includes are | 73     # base_output_dir. Remove that from this config once the includes are | 
| 80     # updated. | 74     # updated. | 
| 81     include_dirs = [ | 75     include_dirs = [ | 
| 82       base_output_dir, | 76       base_output_dir, | 
| 83       package_output_dir, | 77       package_output_dir, | 
| 84     ] | 78     ] | 
| (...skipping 2348 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2433       "--target", | 2427       "--target", | 
| 2434       rebase_path(invoker.target, root_build_dir), | 2428       rebase_path(invoker.target, root_build_dir), | 
| 2435       "--output-directory", | 2429       "--output-directory", | 
| 2436       rebase_path(root_out_dir, root_build_dir), | 2430       rebase_path(root_out_dir, root_build_dir), | 
| 2437     ] | 2431     ] | 
| 2438     if (defined(invoker.flag_name)) { | 2432     if (defined(invoker.flag_name)) { | 
| 2439       args += [ "--flag-name=${invoker.flag_name}" ] | 2433       args += [ "--flag-name=${invoker.flag_name}" ] | 
| 2440     } | 2434     } | 
| 2441   } | 2435   } | 
| 2442 } | 2436 } | 
| OLD | NEW | 
|---|