diff options
author | Ben Murdoch <benm@google.com> | 2013-06-27 01:37:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2013-06-27 01:37:20 +0100 |
commit | e31802ad5b5d9fdf7daba665b671e9ecee368cb8 (patch) | |
tree | 868a2d3d16b01f728ae083a95661d078467c19bb /third_party | |
parent | fb5f38fb600d6a2e6cff0966bbf10dc8e189f50e (diff) | |
download | chromium_org-e31802ad5b5d9fdf7daba665b671e9ecee368cb8.tar.gz |
Fix MIPS makefiles
Change-Id: I7a0daf1617a3908dd628c2fd4f501cbec1483bd9
Diffstat (limited to 'third_party')
58 files changed, 114 insertions, 230 deletions
diff --git a/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-mips.mk b/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-mips.mk index ac0315c602..beb3dabcfe 100644 --- a/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-mips.mk +++ b/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-mips.mk @@ -68,9 +68,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -154,7 +152,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-mips.mk b/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-mips.mk index ac0315c602..beb3dabcfe 100644 --- a/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-mips.mk +++ b/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-mips.mk @@ -68,9 +68,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -154,7 +152,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/hyphen/hyphen.target.darwin-mips.mk b/third_party/hyphen/hyphen.target.darwin-mips.mk index 3d0889e71b..a677800ce0 100644 --- a/third_party/hyphen/hyphen.target.darwin-mips.mk +++ b/third_party/hyphen/hyphen.target.darwin-mips.mk @@ -41,9 +41,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -120,7 +118,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/hyphen/hyphen.target.linux-mips.mk b/third_party/hyphen/hyphen.target.linux-mips.mk index 3d0889e71b..a677800ce0 100644 --- a/third_party/hyphen/hyphen.target.linux-mips.mk +++ b/third_party/hyphen/hyphen.target.linux-mips.mk @@ -41,9 +41,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -120,7 +118,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/iccjpeg/iccjpeg.target.darwin-mips.mk b/third_party/iccjpeg/iccjpeg.target.darwin-mips.mk index 4a5d2fce86..3da42baafb 100644 --- a/third_party/iccjpeg/iccjpeg.target.darwin-mips.mk +++ b/third_party/iccjpeg/iccjpeg.target.darwin-mips.mk @@ -41,9 +41,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -121,7 +119,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/iccjpeg/iccjpeg.target.linux-mips.mk b/third_party/iccjpeg/iccjpeg.target.linux-mips.mk index 4a5d2fce86..3da42baafb 100644 --- a/third_party/iccjpeg/iccjpeg.target.linux-mips.mk +++ b/third_party/iccjpeg/iccjpeg.target.linux-mips.mk @@ -41,9 +41,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -121,7 +119,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/leveldatabase/leveldatabase.target.darwin-mips.mk b/third_party/leveldatabase/leveldatabase.target.darwin-mips.mk index 96f9f69202..f6076017c4 100644 --- a/third_party/leveldatabase/leveldatabase.target.darwin-mips.mk +++ b/third_party/leveldatabase/leveldatabase.target.darwin-mips.mk @@ -77,9 +77,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -162,7 +160,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/leveldatabase/leveldatabase.target.linux-mips.mk b/third_party/leveldatabase/leveldatabase.target.linux-mips.mk index 96f9f69202..f6076017c4 100644 --- a/third_party/leveldatabase/leveldatabase.target.linux-mips.mk +++ b/third_party/leveldatabase/leveldatabase.target.linux-mips.mk @@ -77,9 +77,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -162,7 +160,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libevent/libevent.target.darwin-mips.mk b/third_party/libevent/libevent.target.darwin-mips.mk index 2b7a1369c2..efcab34464 100644 --- a/third_party/libevent/libevent.target.darwin-mips.mk +++ b/third_party/libevent/libevent.target.darwin-mips.mk @@ -53,9 +53,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -133,7 +131,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libevent/libevent.target.linux-mips.mk b/third_party/libevent/libevent.target.linux-mips.mk index 2b7a1369c2..efcab34464 100644 --- a/third_party/libevent/libevent.target.linux-mips.mk +++ b/third_party/libevent/libevent.target.linux-mips.mk @@ -53,9 +53,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -133,7 +131,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libjingle/libjingle.target.darwin-mips.mk b/third_party/libjingle/libjingle.target.darwin-mips.mk index 138e321b07..74ffc0c034 100644 --- a/third_party/libjingle/libjingle.target.darwin-mips.mk +++ b/third_party/libjingle/libjingle.target.darwin-mips.mk @@ -157,9 +157,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -266,7 +264,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libjingle/libjingle.target.linux-mips.mk b/third_party/libjingle/libjingle.target.linux-mips.mk index 138e321b07..74ffc0c034 100644 --- a/third_party/libjingle/libjingle.target.linux-mips.mk +++ b/third_party/libjingle/libjingle.target.linux-mips.mk @@ -157,9 +157,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -266,7 +264,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libjingle/libjingle_p2p_constants.target.darwin-mips.mk b/third_party/libjingle/libjingle_p2p_constants.target.darwin-mips.mk index c4b87d0635..b9a3f16ad9 100644 --- a/third_party/libjingle/libjingle_p2p_constants.target.darwin-mips.mk +++ b/third_party/libjingle/libjingle_p2p_constants.target.darwin-mips.mk @@ -42,9 +42,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -150,7 +148,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libjingle/libjingle_p2p_constants.target.linux-mips.mk b/third_party/libjingle/libjingle_p2p_constants.target.linux-mips.mk index c4b87d0635..b9a3f16ad9 100644 --- a/third_party/libjingle/libjingle_p2p_constants.target.linux-mips.mk +++ b/third_party/libjingle/libjingle_p2p_constants.target.linux-mips.mk @@ -42,9 +42,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -150,7 +148,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libphonenumber/libphonenumber.target.darwin-mips.mk b/third_party/libphonenumber/libphonenumber.target.darwin-mips.mk index 6292de78cb..129f83aac9 100644 --- a/third_party/libphonenumber/libphonenumber.target.darwin-mips.mk +++ b/third_party/libphonenumber/libphonenumber.target.darwin-mips.mk @@ -42,9 +42,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -136,7 +134,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libphonenumber/libphonenumber.target.linux-mips.mk b/third_party/libphonenumber/libphonenumber.target.linux-mips.mk index 6292de78cb..129f83aac9 100644 --- a/third_party/libphonenumber/libphonenumber.target.linux-mips.mk +++ b/third_party/libphonenumber/libphonenumber.target.linux-mips.mk @@ -42,9 +42,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -136,7 +134,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-mips.mk b/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-mips.mk index 227cab275c..ddf3707393 100644 --- a/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-mips.mk +++ b/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-mips.mk @@ -105,9 +105,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -202,7 +200,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-mips.mk b/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-mips.mk index 227cab275c..ddf3707393 100644 --- a/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-mips.mk +++ b/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-mips.mk @@ -105,9 +105,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -202,7 +200,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libpng/libpng.target.darwin-mips.mk b/third_party/libpng/libpng.target.darwin-mips.mk index 3433196b5a..d45c38e0a0 100644 --- a/third_party/libpng/libpng.target.darwin-mips.mk +++ b/third_party/libpng/libpng.target.darwin-mips.mk @@ -56,9 +56,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -137,7 +135,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libpng/libpng.target.linux-mips.mk b/third_party/libpng/libpng.target.linux-mips.mk index 3433196b5a..d45c38e0a0 100644 --- a/third_party/libpng/libpng.target.linux-mips.mk +++ b/third_party/libpng/libpng.target.linux-mips.mk @@ -56,9 +56,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -137,7 +135,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libwebp/libwebp_dec.target.darwin-mips.mk b/third_party/libwebp/libwebp_dec.target.darwin-mips.mk index bc9abb3c78..021038e67a 100644 --- a/third_party/libwebp/libwebp_dec.target.darwin-mips.mk +++ b/third_party/libwebp/libwebp_dec.target.darwin-mips.mk @@ -51,9 +51,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -130,7 +128,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libwebp/libwebp_dec.target.linux-mips.mk b/third_party/libwebp/libwebp_dec.target.linux-mips.mk index bc9abb3c78..021038e67a 100644 --- a/third_party/libwebp/libwebp_dec.target.linux-mips.mk +++ b/third_party/libwebp/libwebp_dec.target.linux-mips.mk @@ -51,9 +51,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -130,7 +128,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libwebp/libwebp_demux.target.darwin-mips.mk b/third_party/libwebp/libwebp_demux.target.darwin-mips.mk index b852f30d01..7c9b720453 100644 --- a/third_party/libwebp/libwebp_demux.target.darwin-mips.mk +++ b/third_party/libwebp/libwebp_demux.target.darwin-mips.mk @@ -40,9 +40,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -119,7 +117,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libwebp/libwebp_demux.target.linux-mips.mk b/third_party/libwebp/libwebp_demux.target.linux-mips.mk index b852f30d01..7c9b720453 100644 --- a/third_party/libwebp/libwebp_demux.target.linux-mips.mk +++ b/third_party/libwebp/libwebp_demux.target.linux-mips.mk @@ -40,9 +40,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -119,7 +117,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libwebp/libwebp_dsp.target.darwin-mips.mk b/third_party/libwebp/libwebp_dsp.target.darwin-mips.mk index 6af529f6ec..3821a8cda4 100644 --- a/third_party/libwebp/libwebp_dsp.target.darwin-mips.mk +++ b/third_party/libwebp/libwebp_dsp.target.darwin-mips.mk @@ -48,9 +48,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -127,7 +125,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libwebp/libwebp_dsp.target.linux-mips.mk b/third_party/libwebp/libwebp_dsp.target.linux-mips.mk index 6af529f6ec..3821a8cda4 100644 --- a/third_party/libwebp/libwebp_dsp.target.linux-mips.mk +++ b/third_party/libwebp/libwebp_dsp.target.linux-mips.mk @@ -48,9 +48,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -127,7 +125,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libwebp/libwebp_enc.target.darwin-mips.mk b/third_party/libwebp/libwebp_enc.target.darwin-mips.mk index 20209afb10..73116ac748 100644 --- a/third_party/libwebp/libwebp_enc.target.darwin-mips.mk +++ b/third_party/libwebp/libwebp_enc.target.darwin-mips.mk @@ -56,9 +56,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -135,7 +133,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libwebp/libwebp_enc.target.linux-mips.mk b/third_party/libwebp/libwebp_enc.target.linux-mips.mk index 20209afb10..73116ac748 100644 --- a/third_party/libwebp/libwebp_enc.target.linux-mips.mk +++ b/third_party/libwebp/libwebp_enc.target.linux-mips.mk @@ -56,9 +56,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -135,7 +133,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libwebp/libwebp_utils.target.darwin-mips.mk b/third_party/libwebp/libwebp_utils.target.darwin-mips.mk index 3dc8ac835f..269ff654e1 100644 --- a/third_party/libwebp/libwebp_utils.target.darwin-mips.mk +++ b/third_party/libwebp/libwebp_utils.target.darwin-mips.mk @@ -50,9 +50,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -129,7 +127,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libwebp/libwebp_utils.target.linux-mips.mk b/third_party/libwebp/libwebp_utils.target.linux-mips.mk index 3dc8ac835f..269ff654e1 100644 --- a/third_party/libwebp/libwebp_utils.target.linux-mips.mk +++ b/third_party/libwebp/libwebp_utils.target.linux-mips.mk @@ -50,9 +50,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -129,7 +127,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libxml/libxml.target.darwin-mips.mk b/third_party/libxml/libxml.target.darwin-mips.mk index 47c7eb3fa3..d9c6ca78c0 100644 --- a/third_party/libxml/libxml.target.darwin-mips.mk +++ b/third_party/libxml/libxml.target.darwin-mips.mk @@ -85,9 +85,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -173,7 +171,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libxml/libxml.target.linux-mips.mk b/third_party/libxml/libxml.target.linux-mips.mk index 47c7eb3fa3..d9c6ca78c0 100644 --- a/third_party/libxml/libxml.target.linux-mips.mk +++ b/third_party/libxml/libxml.target.linux-mips.mk @@ -85,9 +85,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -173,7 +171,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libxslt/libxslt.target.darwin-mips.mk b/third_party/libxslt/libxslt.target.darwin-mips.mk index a0be81784b..42a4ddc565 100644 --- a/third_party/libxslt/libxslt.target.darwin-mips.mk +++ b/third_party/libxslt/libxslt.target.darwin-mips.mk @@ -58,9 +58,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -146,7 +144,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/libxslt/libxslt.target.linux-mips.mk b/third_party/libxslt/libxslt.target.linux-mips.mk index a0be81784b..42a4ddc565 100644 --- a/third_party/libxslt/libxslt.target.linux-mips.mk +++ b/third_party/libxslt/libxslt.target.linux-mips.mk @@ -58,9 +58,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -146,7 +144,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/lzma_sdk/lzma_sdk.target.darwin-mips.mk b/third_party/lzma_sdk/lzma_sdk.target.darwin-mips.mk index b1735b3762..8cee4d4bcb 100644 --- a/third_party/lzma_sdk/lzma_sdk.target.darwin-mips.mk +++ b/third_party/lzma_sdk/lzma_sdk.target.darwin-mips.mk @@ -57,9 +57,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -138,7 +136,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/lzma_sdk/lzma_sdk.target.linux-mips.mk b/third_party/lzma_sdk/lzma_sdk.target.linux-mips.mk index b1735b3762..8cee4d4bcb 100644 --- a/third_party/lzma_sdk/lzma_sdk.target.linux-mips.mk +++ b/third_party/lzma_sdk/lzma_sdk.target.linux-mips.mk @@ -57,9 +57,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -138,7 +136,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/modp_b64/modp_b64.target.darwin-mips.mk b/third_party/modp_b64/modp_b64.target.darwin-mips.mk index 4d02a0b86a..d13287a37b 100644 --- a/third_party/modp_b64/modp_b64.target.darwin-mips.mk +++ b/third_party/modp_b64/modp_b64.target.darwin-mips.mk @@ -41,9 +41,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -120,7 +118,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/modp_b64/modp_b64.target.linux-mips.mk b/third_party/modp_b64/modp_b64.target.linux-mips.mk index 4d02a0b86a..d13287a37b 100644 --- a/third_party/modp_b64/modp_b64.target.linux-mips.mk +++ b/third_party/modp_b64/modp_b64.target.linux-mips.mk @@ -41,9 +41,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -120,7 +118,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/npapi/npapi.target.darwin-mips.mk b/third_party/npapi/npapi.target.darwin-mips.mk index b44be02602..60c6808dd8 100644 --- a/third_party/npapi/npapi.target.darwin-mips.mk +++ b/third_party/npapi/npapi.target.darwin-mips.mk @@ -40,9 +40,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/third_party/npapi/npapi.target.linux-mips.mk b/third_party/npapi/npapi.target.linux-mips.mk index b44be02602..60c6808dd8 100644 --- a/third_party/npapi/npapi.target.linux-mips.mk +++ b/third_party/npapi/npapi.target.linux-mips.mk @@ -40,9 +40,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/third_party/opus/opus.target.darwin-mips.mk b/third_party/opus/opus.target.darwin-mips.mk index fb6f50de10..e8de31a400 100644 --- a/third_party/opus/opus.target.darwin-mips.mk +++ b/third_party/opus/opus.target.darwin-mips.mk @@ -161,9 +161,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -249,7 +247,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/opus/opus.target.linux-mips.mk b/third_party/opus/opus.target.linux-mips.mk index fb6f50de10..e8de31a400 100644 --- a/third_party/opus/opus.target.linux-mips.mk +++ b/third_party/opus/opus.target.linux-mips.mk @@ -161,9 +161,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -249,7 +247,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/protobuf/protobuf_lite.target.darwin-mips.mk b/third_party/protobuf/protobuf_lite.target.darwin-mips.mk index 8d5536e0e2..29d3aaa68d 100644 --- a/third_party/protobuf/protobuf_lite.target.darwin-mips.mk +++ b/third_party/protobuf/protobuf_lite.target.darwin-mips.mk @@ -53,9 +53,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -137,7 +135,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/protobuf/protobuf_lite.target.linux-mips.mk b/third_party/protobuf/protobuf_lite.target.linux-mips.mk index 8d5536e0e2..29d3aaa68d 100644 --- a/third_party/protobuf/protobuf_lite.target.linux-mips.mk +++ b/third_party/protobuf/protobuf_lite.target.linux-mips.mk @@ -53,9 +53,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -137,7 +135,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/qcms/qcms.target.darwin-mips.mk b/third_party/qcms/qcms.target.darwin-mips.mk index 430308b54d..61c2e0eb11 100644 --- a/third_party/qcms/qcms.target.darwin-mips.mk +++ b/third_party/qcms/qcms.target.darwin-mips.mk @@ -44,9 +44,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -122,7 +120,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/qcms/qcms.target.linux-mips.mk b/third_party/qcms/qcms.target.linux-mips.mk index 430308b54d..61c2e0eb11 100644 --- a/third_party/qcms/qcms.target.linux-mips.mk +++ b/third_party/qcms/qcms.target.linux-mips.mk @@ -44,9 +44,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -122,7 +120,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/re2/re2.target.darwin-mips.mk b/third_party/re2/re2.target.darwin-mips.mk index da08cbd215..024300158f 100644 --- a/third_party/re2/re2.target.darwin-mips.mk +++ b/third_party/re2/re2.target.darwin-mips.mk @@ -65,9 +65,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -145,7 +143,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/re2/re2.target.linux-mips.mk b/third_party/re2/re2.target.linux-mips.mk index da08cbd215..024300158f 100644 --- a/third_party/re2/re2.target.linux-mips.mk +++ b/third_party/re2/re2.target.linux-mips.mk @@ -65,9 +65,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -145,7 +143,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/smhasher/cityhash.target.darwin-mips.mk b/third_party/smhasher/cityhash.target.darwin-mips.mk index 9110ecd38d..79ad8cb4ef 100644 --- a/third_party/smhasher/cityhash.target.darwin-mips.mk +++ b/third_party/smhasher/cityhash.target.darwin-mips.mk @@ -40,9 +40,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -118,7 +116,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/smhasher/cityhash.target.linux-mips.mk b/third_party/smhasher/cityhash.target.linux-mips.mk index 9110ecd38d..79ad8cb4ef 100644 --- a/third_party/smhasher/cityhash.target.linux-mips.mk +++ b/third_party/smhasher/cityhash.target.linux-mips.mk @@ -40,9 +40,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -118,7 +116,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/sqlite/sqlite.target.darwin-mips.mk b/third_party/sqlite/sqlite.target.darwin-mips.mk index e2f02ae416..17cb7a6632 100644 --- a/third_party/sqlite/sqlite.target.darwin-mips.mk +++ b/third_party/sqlite/sqlite.target.darwin-mips.mk @@ -48,9 +48,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -148,7 +146,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/sqlite/sqlite.target.linux-mips.mk b/third_party/sqlite/sqlite.target.linux-mips.mk index e2f02ae416..17cb7a6632 100644 --- a/third_party/sqlite/sqlite.target.linux-mips.mk +++ b/third_party/sqlite/sqlite.target.linux-mips.mk @@ -48,9 +48,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -148,7 +146,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/zlib/minizip.target.darwin-mips.mk b/third_party/zlib/minizip.target.darwin-mips.mk index 8353fd9369..3e6d3dd6b6 100644 --- a/third_party/zlib/minizip.target.darwin-mips.mk +++ b/third_party/zlib/minizip.target.darwin-mips.mk @@ -42,9 +42,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -123,7 +121,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/zlib/minizip.target.linux-mips.mk b/third_party/zlib/minizip.target.linux-mips.mk index 8353fd9369..3e6d3dd6b6 100644 --- a/third_party/zlib/minizip.target.linux-mips.mk +++ b/third_party/zlib/minizip.target.linux-mips.mk @@ -42,9 +42,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -123,7 +121,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/zlib/zip.target.darwin-mips.mk b/third_party/zlib/zip.target.darwin-mips.mk index 5484ab7f63..c305888513 100644 --- a/third_party/zlib/zip.target.darwin-mips.mk +++ b/third_party/zlib/zip.target.darwin-mips.mk @@ -43,9 +43,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -124,7 +122,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/zlib/zip.target.linux-mips.mk b/third_party/zlib/zip.target.linux-mips.mk index 5484ab7f63..c305888513 100644 --- a/third_party/zlib/zip.target.linux-mips.mk +++ b/third_party/zlib/zip.target.linux-mips.mk @@ -43,9 +43,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -124,7 +122,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/zlib/zlib.target.darwin-mips.mk b/third_party/zlib/zlib.target.darwin-mips.mk index d930013a55..9a8087578b 100644 --- a/third_party/zlib/zlib.target.darwin-mips.mk +++ b/third_party/zlib/zlib.target.darwin-mips.mk @@ -54,9 +54,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -133,7 +131,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/third_party/zlib/zlib.target.linux-mips.mk b/third_party/zlib/zlib.target.linux-mips.mk index d930013a55..9a8087578b 100644 --- a/third_party/zlib/zlib.target.linux-mips.mk +++ b/third_party/zlib/zlib.target.linux-mips.mk @@ -54,9 +54,7 @@ MY_CFLAGS := \ -Wno-format \ -EL \ -mhard-float \ - -mips32r2 \ - -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -133,7 +131,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google2/src/clank/webview/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ |