| 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("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") |
| 6 import("//build/config/sanitizers/sanitizers.gni") | 6 import("//build/config/sanitizers/sanitizers.gni") |
| 7 import("//build/config/sysroot.gni") | 7 import("//build/config/sysroot.gni") |
| 8 | 8 |
| 9 assert(is_android) | 9 assert(is_android) |
| 10 | 10 |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 rebase_path(android_libgcc_file), | 188 rebase_path(android_libgcc_file), |
| 189 ] | 189 ] |
| 190 } | 190 } |
| 191 | 191 |
| 192 # Clang with libc++ does not require an explicit atomic library reference. | 192 # Clang with libc++ does not require an explicit atomic library reference. |
| 193 if (!is_clang) { | 193 if (!is_clang) { |
| 194 libs += [ "atomic" ] | 194 libs += [ "atomic" ] |
| 195 } | 195 } |
| 196 } | 196 } |
| 197 | 197 |
| 198 config("sdk") { | |
| 199 if (sysroot != "") { | |
| 200 cflags = [ "--sysroot=" + sysroot ] | |
| 201 asmflags = [ "--sysroot=" + sysroot ] | |
| 202 ldflags = [ "--sysroot=" + sysroot ] | |
| 203 | |
| 204 # Need to get some linker flags out of the sysroot. | |
| 205 sysroot_ld_path = rebase_path("//build/config/linux/sysroot_ld_path.py") | |
| 206 ldflags += [ exec_script(sysroot_ld_path, | |
| 207 [ | |
| 208 rebase_path("//build/linux/sysroot_ld_path.sh"), | |
| 209 sysroot, | |
| 210 ], | |
| 211 "value") ] | |
| 212 } | |
| 213 } | |
| 214 | |
| 215 config("executable_config") { | 198 config("executable_config") { |
| 216 cflags = [ "-fPIE" ] | 199 cflags = [ "-fPIE" ] |
| 217 asmflags = [ "-fPIE" ] | 200 asmflags = [ "-fPIE" ] |
| 218 ldflags = [ "-pie" ] | 201 ldflags = [ "-pie" ] |
| 219 } | 202 } |
| 220 | 203 |
| 221 config("hide_native_jni_exports") { | 204 config("hide_native_jni_exports") { |
| 222 ldflags = [ "-Wl,--version-script=" + | 205 ldflags = [ "-Wl,--version-script=" + |
| 223 rebase_path("//build/android/android_no_jni_exports.lst") ] | 206 rebase_path("//build/android/android_no_jni_exports.lst") ] |
| 224 } | 207 } |
| (...skipping 24 matching lines...) Expand all Loading... |
| 249 | 232 |
| 250 # Avoid errors with current NDK: | 233 # Avoid errors with current NDK: |
| 251 # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebui
lt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3426
:3: error: argument must be a constant" | 234 # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebui
lt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3426
:3: error: argument must be a constant" |
| 252 "-finstrument-functions-exclude-file-list=arm_neon.h,SaturatedArithmeticARM.
h", | 235 "-finstrument-functions-exclude-file-list=arm_neon.h,SaturatedArithmeticARM.
h", |
| 253 ] | 236 ] |
| 254 defines = [ "CYGPROFILE_INSTRUMENTATION=1" ] | 237 defines = [ "CYGPROFILE_INSTRUMENTATION=1" ] |
| 255 } | 238 } |
| 256 | 239 |
| 257 config("no_cygprofile_instrumentation") { | 240 config("no_cygprofile_instrumentation") { |
| 258 } | 241 } |
| OLD | NEW |