Chromium Code Reviews| 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("mojo.gni") | 5 import("mojo.gni") |
| 6 import("mojo_sdk.gni") | 6 import("mojo_sdk.gni") |
| 7 | 7 |
| 8 # Generate a binary mojo application.The parameters of this template are those | 8 # Generate a binary mojo application.The parameters of this template are those |
| 9 # of a shared library. | 9 # of a shared library. |
| 10 template("mojo_native_application") { | 10 template("mojo_native_application") { |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 154 | 154 |
| 155 if (is_android) { | 155 if (is_android) { |
| 156 # Declares an Android Mojo application consisting of an .so file and a | 156 # Declares an Android Mojo application consisting of an .so file and a |
| 157 # corresponding .dex.jar file. | 157 # corresponding .dex.jar file. |
| 158 # | 158 # |
| 159 # Variables: | 159 # Variables: |
| 160 # input_so: the .so file to bundle | 160 # input_so: the .so file to bundle |
| 161 # input_dex_jar: the .dex.jar file to bundle | 161 # input_dex_jar: the .dex.jar file to bundle |
| 162 # output_name (optional): override for the output file name | 162 # output_name (optional): override for the output file name |
| 163 template("mojo_android_application") { | 163 template("mojo_android_application") { |
| 164 assert(defined(invoker.input_dex_jar)) | |
|
qsr
2015/02/06 17:16:14
Can you revert the changes on this file?
etiennej
2015/02/09 14:09:52
Done.
| |
| 164 assert(defined(invoker.input_so)) | 165 assert(defined(invoker.input_so)) |
| 165 assert(defined(invoker.input_dex_jar)) | |
| 166 | 166 |
| 167 zip_action_name = "${target_name}_zip" | 167 zip_action_name = "${target_name}_zip" |
| 168 zip_action_output = "$target_gen_dir/${target_name}.zip" | 168 zip_action_output = "$target_gen_dir/${target_name}.zip" |
| 169 action(zip_action_name) { | 169 action(zip_action_name) { |
| 170 script = "//build/android/gn/zip.py" | 170 script = "//build/android/gn/zip.py" |
| 171 | 171 |
| 172 inputs = [ | 172 inputs = [ |
| 173 invoker.input_so, | 173 invoker.input_so, |
| 174 invoker.input_dex_jar, | 174 invoker.input_dex_jar, |
| 175 ] | 175 ] |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 209 rebase_input = rebase_path(input, root_build_dir) | 209 rebase_input = rebase_path(input, root_build_dir) |
| 210 rebase_output = rebase_path(output, root_build_dir) | 210 rebase_output = rebase_path(output, root_build_dir) |
| 211 args = [ | 211 args = [ |
| 212 "--input=$rebase_input", | 212 "--input=$rebase_input", |
| 213 "--output=$rebase_output", | 213 "--output=$rebase_output", |
| 214 "--line=#!mojo mojo:android_handler", | 214 "--line=#!mojo mojo:android_handler", |
| 215 ] | 215 ] |
| 216 } | 216 } |
| 217 } | 217 } |
| 218 } | 218 } |
| OLD | NEW |