| 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 | 
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 188     ldflags += [ "-Wl,--warn-shared-textrel" ] | 188     ldflags += [ "-Wl,--warn-shared-textrel" ] | 
| 189   } | 189   } | 
| 190 } | 190 } | 
| 191 | 191 | 
| 192 config("executable_config") { | 192 config("executable_config") { | 
| 193   cflags = [ "-fPIE" ] | 193   cflags = [ "-fPIE" ] | 
| 194   asmflags = [ "-fPIE" ] | 194   asmflags = [ "-fPIE" ] | 
| 195   ldflags = [ "-pie" ] | 195   ldflags = [ "-pie" ] | 
| 196 } | 196 } | 
| 197 | 197 | 
| 198 config("hide_native_jni_exports") { |  | 
| 199   ldflags = [ "-Wl,--version-script=" + |  | 
| 200               rebase_path("//build/android/android_no_jni_exports.lst") ] |  | 
| 201 } |  | 
| 202 |  | 
| 203 config("hide_all_but_jni_onload") { | 198 config("hide_all_but_jni_onload") { | 
| 204   # TODO(agrieve): https://codereview.chromium.org/2633593004/ | 199   ldflags = [ "-Wl,--version-script=" + rebase_path( | 
|  | 200                   "//build/android/android_only_explicit_jni_exports.lst") ] | 
| 205 } | 201 } | 
| 206 | 202 | 
| 207 config("hide_all_but_jni") { | 203 config("hide_all_but_jni") { | 
| 208   # TODO(agrieve): https://codereview.chromium.org/2633593004/ | 204   ldflags = [ "-Wl,--version-script=" + | 
|  | 205               rebase_path("//build/android/android_only_jni_exports.lst") ] | 
| 209 } | 206 } | 
| 210 | 207 | 
| 211 # Instrumentation ------------------------------------------------------------- | 208 # Instrumentation ------------------------------------------------------------- | 
| 212 # | 209 # | 
| 213 # The BUILDCONFIG file sets the "default_cygprofile_instrumentation" config on | 210 # The BUILDCONFIG file sets the "default_cygprofile_instrumentation" config on | 
| 214 # targets by default. You can override whether the cygprofile instrumentation is | 211 # targets by default. You can override whether the cygprofile instrumentation is | 
| 215 # used on a per-target basis: | 212 # used on a per-target basis: | 
| 216 # | 213 # | 
| 217 # configs -= [ "//build/config/android:default_cygprofile_instrumentation" ] | 214 # configs -= [ "//build/config/android:default_cygprofile_instrumentation" ] | 
| 218 # configs += [ "//build/config/android:no_cygprofile_instrumentation" ] | 215 # configs += [ "//build/config/android:no_cygprofile_instrumentation" ] | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
| 236 | 233 | 
| 237       # Avoid errors with current NDK: | 234       # Avoid errors with current NDK: | 
| 238       # "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" | 235       # "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" | 
| 239       "-finstrument-functions-exclude-file-list=arm_neon.h", | 236       "-finstrument-functions-exclude-file-list=arm_neon.h", | 
| 240     ] | 237     ] | 
| 241   } | 238   } | 
| 242 } | 239 } | 
| 243 | 240 | 
| 244 config("no_cygprofile_instrumentation") { | 241 config("no_cygprofile_instrumentation") { | 
| 245 } | 242 } | 
| OLD | NEW | 
|---|