| Index: build/config/android/BUILD.gn
|
| diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
|
| index 2d789333645cecaccc3f02887dbe956d70422796..fddca1be0b3cc771957fdc8908052f17dba734fe 100644
|
| --- a/build/config/android/BUILD.gn
|
| +++ b/build/config/android/BUILD.gn
|
| @@ -27,14 +27,10 @@ config("compiler") {
|
| ]
|
|
|
| if (is_clang) {
|
| - rebased_android_toolchain_root =
|
| - rebase_path(android_toolchain_root, root_build_dir)
|
| - assert(rebased_android_toolchain_root != "") # Mark as used.
|
| if (current_cpu == "mips64el") {
|
| cflags += [
|
| - # TODO(gordanac) Enable integrated-as.
|
| - "-fno-integrated-as",
|
| - "-B${rebased_android_toolchain_root}/bin", # Else /usr/bin/as gets picked up.
|
| + # Have to force IAS for mips64.
|
| + "-fintegrated-as",
|
| ]
|
| }
|
| } else {
|
|
|