Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(278)

Side by Side Diff: build/config/android/config.gni

Issue 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/config/BUILD.gn ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 declare_args() { 8 declare_args() {
9 # Absolute directory containing the Android source code. 9 # Absolute directory containing the Android source code.
10 android_src = "" 10 android_src = ""
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 } else if (cpu_arch == "mipsel") { 107 } else if (cpu_arch == "mipsel") {
108 android_prebuilt_arch = "android-mips" 108 android_prebuilt_arch = "android-mips"
109 _binary_prefix = "mipsel-linux-android" 109 _binary_prefix = "mipsel-linux-android"
110 android_toolchain_root = "$mips_android_toolchain_root" 110 android_toolchain_root = "$mips_android_toolchain_root"
111 android_libgcc_file = 111 android_libgcc_file =
112 "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain _version}/libgcc.a" 112 "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain _version}/libgcc.a"
113 } else { 113 } else {
114 assert(false, "Need android libgcc support for your target arch.") 114 assert(false, "Need android libgcc support for your target arch.")
115 } 115 }
116 116
117 android_readelf = "$android_toolchain_root/bin/$_binary_prefix-readelf" 117 android_tool_prefix = "$android_toolchain_root/bin/$_binary_prefix-"
118 android_readelf = "${android_tool_prefix}readelf"
119 android_objcopy = "${android_tool_prefix}objcopy"
118 android_gdbserver = "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserv er/gdbserver" 120 android_gdbserver = "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserv er/gdbserver"
119 121
120 # stlport stuff -------------------------------------------------------------- 122 # stlport stuff --------------------------------------------------------------
121 123
122 if (component_mode == "shared_library") { 124 if (component_mode == "shared_library") {
123 android_stlport_library = "stlport_shared" 125 android_stlport_library = "stlport_shared"
124 } else { 126 } else {
125 android_stlport_library = "stlport_static" 127 android_stlport_library = "stlport_static"
126 } 128 }
127 129
(...skipping 11 matching lines...) Expand all
139 } else if (cpu_arch == "mipsel") { 141 } else if (cpu_arch == "mipsel") {
140 android_app_abi = "mips" 142 android_app_abi = "mips"
141 } else { 143 } else {
142 assert(false, "Unknown Android ABI: " + cpu_arch) 144 assert(false, "Unknown Android ABI: " + cpu_arch)
143 } 145 }
144 } else { 146 } else {
145 if (!defined(is_android_webview_build)) { 147 if (!defined(is_android_webview_build)) {
146 is_android_webview_build = false 148 is_android_webview_build = false
147 } 149 }
148 } 150 }
OLDNEW
« no previous file with comments | « build/config/BUILD.gn ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698