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 # This file contains common system config stuff for the Android build. | 5 # This file contains common system config stuff for the Android build. |
| 6 | 6 |
| 7 if (is_android) { | 7 if (is_android) { |
| 8 has_chrome_android_internal = exec_script("//build/dir_exists.py", | 8 has_chrome_android_internal = exec_script("//build/dir_exists.py", |
| 9 [ rebase_path("//clank", root_build_dir) ], | 9 [ rebase_path("//clank", root_build_dir) ], |
| 10 "string") == "True" | 10 "string") == "True" |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 145 android_objcopy = "${android_tool_prefix}objcopy" | 145 android_objcopy = "${android_tool_prefix}objcopy" |
| 146 android_gdbserver = "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserv er/gdbserver" | 146 android_gdbserver = "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserv er/gdbserver" |
| 147 | 147 |
| 148 # stlport stuff -------------------------------------------------------------- | 148 # stlport stuff -------------------------------------------------------------- |
| 149 | 149 |
| 150 if (component_mode == "shared_library") { | 150 if (component_mode == "shared_library") { |
| 151 android_stlport_library = "stlport_shared" | 151 android_stlport_library = "stlport_shared" |
| 152 } else { | 152 } else { |
| 153 android_stlport_library = "stlport_static" | 153 android_stlport_library = "stlport_static" |
| 154 } | 154 } |
| 155 if (!is_android_webview_build) { | |
| 156 v8_use_external_startup_data = true | |
|
rmcilroy
2014/11/24 17:05:25
I think you want this to be false until https://co
baixo1
2014/11/24 21:27:10
Yes, thanks!
| |
| 157 } | |
| 155 } else { | 158 } else { |
| 156 if (!defined(is_android_webview_build)) { | 159 if (!defined(is_android_webview_build)) { |
| 157 is_android_webview_build = false | 160 is_android_webview_build = false |
| 158 } | 161 } |
| 159 } | 162 } |
| OLD | NEW |