| 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 | 7 |
| 8 assert(is_android) | 8 assert(is_android) |
| 9 | 9 |
| 10 # This is included by reference in the //build/config/compiler config that | 10 # This is included by reference in the //build/config/compiler config that |
| 11 # is applied to all targets. It is here to separate out the logic that is | 11 # is applied to all targets. It is here to separate out the logic that is |
| 12 # Android-only. | 12 # Android-only. |
| 13 config("compiler") { | 13 config("compiler") { |
| 14 cflags = [ | 14 cflags = [ |
| 15 "-ffunction-sections", | 15 "-ffunction-sections", |
| 16 "-fno-short-enums", | 16 "-fno-short-enums", |
| 17 ] | 17 ] |
| 18 defines = [ | 18 defines = [ |
| 19 "ANDROID", | 19 "ANDROID", |
| 20 | 20 |
| 21 # The NDK has these things, but doesn't define the constants to say that it | 21 # The NDK has these things, but doesn't define the constants to say that it |
| 22 # does. Define them here instead. | 22 # does. Define them here instead. |
| 23 "HAVE_SYS_UIO_H", | 23 "HAVE_SYS_UIO_H", |
| 24 |
| 25 # Forces full rebuilds on NDK rolls. |
| 26 "ANDROID_NDK_VERSION=${android_ndk_version}", |
| 24 ] | 27 ] |
| 25 | 28 |
| 26 if (is_clang) { | 29 if (is_clang) { |
| 27 rebased_android_toolchain_root = | 30 rebased_android_toolchain_root = |
| 28 rebase_path(android_toolchain_root, root_build_dir) | 31 rebase_path(android_toolchain_root, root_build_dir) |
| 29 assert(rebased_android_toolchain_root != "") # Mark as used. | 32 assert(rebased_android_toolchain_root != "") # Mark as used. |
| 30 if (current_cpu == "mipsel" || current_cpu == "mips64el") { | 33 if (current_cpu == "mipsel" || current_cpu == "mips64el") { |
| 31 cflags += [ | 34 cflags += [ |
| 32 # TODO(gordanac) Enable integrated-as. | 35 # TODO(gordanac) Enable integrated-as. |
| 33 "-fno-integrated-as", | 36 "-fno-integrated-as", |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 | 188 |
| 186 # Avoid errors with current NDK: | 189 # Avoid errors with current NDK: |
| 187 # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/preb
uilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:34
26:3: error: argument must be a constant" | 190 # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/preb
uilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:34
26:3: error: argument must be a constant" |
| 188 "-finstrument-functions-exclude-file-list=arm_neon.h", | 191 "-finstrument-functions-exclude-file-list=arm_neon.h", |
| 189 ] | 192 ] |
| 190 } | 193 } |
| 191 } | 194 } |
| 192 | 195 |
| 193 config("no_cygprofile_instrumentation") { | 196 config("no_cygprofile_instrumentation") { |
| 194 } | 197 } |
| OLD | NEW |