| Index: build/config/android/BUILD.gn
|
| diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
|
| index 570417b080bde70c27ce08ccb17efaef8cc3b5ad..cfbde79dbc54b597ff43b28b277994a17b4afa67 100644
|
| --- a/build/config/android/BUILD.gn
|
| +++ b/build/config/android/BUILD.gn
|
| @@ -33,9 +33,9 @@ config("compiler") {
|
| if (is_clang) {
|
| rebased_android_toolchain_root =
|
| rebase_path(android_toolchain_root, root_build_dir)
|
| - if (current_cpu == "arm" || current_cpu == "mipsel") {
|
| + if (current_cpu == "mipsel") {
|
| cflags += [
|
| - # TODO(hans) Enable integrated-as (crbug.com/124610).
|
| + # TODO(gordanac) Enable integrated-as.
|
| "-no-integrated-as",
|
| "-B${rebased_android_toolchain_root}/bin", # Else /usr/bin/as gets picked up.
|
| ]
|
|
|