| Index: build/config/android/BUILD.gn
|
| diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
|
| index ec80f23747dbabad84ce03b1ebc780dac5e2e977..22a607521d012a4fd8111cf7c7bc321604e100d5 100644
|
| --- a/build/config/android/BUILD.gn
|
| +++ b/build/config/android/BUILD.gn
|
| @@ -154,29 +154,18 @@ config("runtime_library") {
|
| libs = [ "c++_static" ]
|
| }
|
|
|
| - # libgcc must come before libdl for ld.bfd (MIPS)
|
| - if (current_cpu == "mipsel") {
|
| - libs += [
|
| - # ld linker is used for mips Android, and ld does not accept library
|
| - # absolute path prefixed by "-l"; Since libgcc does not exist in mips
|
| - # sysroot the proper library will be linked.
|
| - # TODO(gordanac): Remove once gold linker is used for mips Android.
|
| - "gcc",
|
| - ]
|
| - } else {
|
| - libs += [
|
| - # Manually link the libgcc.a that the cross compiler uses. This is
|
| - # absolute because the linker will look inside the sysroot if it's not.
|
| - rebase_path(android_libgcc_file),
|
| - ]
|
| - }
|
| -
|
| + # Manually link the libgcc.a that the cross compiler uses. This is
|
| + # absolute because the linker will look inside the sysroot if it's not.
|
| libs += [
|
| + rebase_path(android_libgcc_file),
|
| "c",
|
| - "dl",
|
| - "m",
|
| ]
|
|
|
| + # Clang with libc++ does not require an explicit atomic library reference.
|
| + if (!is_clang) {
|
| + libs += [ "atomic" ]
|
| + }
|
| +
|
| if (is_clang) {
|
| # Work around incompatibilities between bionic and clang headers.
|
| defines += [
|
| @@ -190,11 +179,6 @@ config("runtime_library") {
|
| if (current_cpu != "mipsel" && current_cpu != "mips64el") {
|
| ldflags += [ "-Wl,--warn-shared-textrel" ]
|
| }
|
| -
|
| - # Clang with libc++ does not require an explicit atomic library reference.
|
| - if (!is_clang) {
|
| - libs += [ "atomic" ]
|
| - }
|
| }
|
|
|
| config("executable_config") {
|
|
|