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 /android_webview | |
| parent | fb5f38fb600d6a2e6cff0966bbf10dc8e189f50e (diff) | |
| download | chromium_org-e31802ad5b5d9fdf7daba665b671e9ecee368cb8.tar.gz | |
Fix MIPS makefiles
Change-Id: I7a0daf1617a3908dd628c2fd4f501cbec1483bd9
Diffstat (limited to 'android_webview')
10 files changed, 16 insertions, 36 deletions
diff --git a/android_webview/android_webview_common.target.darwin-mips.mk b/android_webview/android_webview_common.target.darwin-mips.mk index 426b925ed9..482ef3e692 100644 --- a/android_webview/android_webview_common.target.darwin-mips.mk +++ b/android_webview/android_webview_common.target.darwin-mips.mk @@ -83,9 +83,7 @@ MY_CFLAGS := \ -fPIC \ -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 \ @@ -187,7 +185,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/android_webview/android_webview_common.target.linux-mips.mk b/android_webview/android_webview_common.target.linux-mips.mk index 426b925ed9..482ef3e692 100644 --- a/android_webview/android_webview_common.target.linux-mips.mk +++ b/android_webview/android_webview_common.target.linux-mips.mk @@ -83,9 +83,7 @@ MY_CFLAGS := \ -fPIC \ -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 \ @@ -187,7 +185,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/android_webview/libwebviewchromium.target.darwin-mips.mk b/android_webview/libwebviewchromium.target.darwin-mips.mk index 772747eb84..d40f142f65 100644 --- a/android_webview/libwebviewchromium.target.darwin-mips.mk +++ b/android_webview/libwebviewchromium.target.darwin-mips.mk @@ -261,9 +261,7 @@ MY_CFLAGS := \ -fPIC \ -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 \ @@ -343,7 +341,7 @@ LOCAL_LDFLAGS := \ -Wl,--no-fatal-warnings \ -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/android_webview/libwebviewchromium.target.linux-mips.mk b/android_webview/libwebviewchromium.target.linux-mips.mk index 772747eb84..d40f142f65 100644 --- a/android_webview/libwebviewchromium.target.linux-mips.mk +++ b/android_webview/libwebviewchromium.target.linux-mips.mk @@ -261,9 +261,7 @@ MY_CFLAGS := \ -fPIC \ -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 \ @@ -343,7 +341,7 @@ LOCAL_LDFLAGS := \ -Wl,--no-fatal-warnings \ -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/android_webview/native/android_jar_jni_headers.target.darwin-mips.mk b/android_webview/native/android_jar_jni_headers.target.darwin-mips.mk index 6430d1d859..a0cf3e5946 100644 --- a/android_webview/native/android_jar_jni_headers.target.darwin-mips.mk +++ b/android_webview/native/android_jar_jni_headers.target.darwin-mips.mk @@ -53,9 +53,7 @@ MY_CFLAGS := \ -fPIC \ -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/android_webview/native/android_jar_jni_headers.target.linux-mips.mk b/android_webview/native/android_jar_jni_headers.target.linux-mips.mk index 6430d1d859..a0cf3e5946 100644 --- a/android_webview/native/android_jar_jni_headers.target.linux-mips.mk +++ b/android_webview/native/android_jar_jni_headers.target.linux-mips.mk @@ -53,9 +53,7 @@ MY_CFLAGS := \ -fPIC \ -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/android_webview/native/android_webview_native_jni.target.darwin-mips.mk b/android_webview/native/android_webview_native_jni.target.darwin-mips.mk index ebd9ecf12f..69684f03e3 100644 --- a/android_webview/native/android_webview_native_jni.target.darwin-mips.mk +++ b/android_webview/native/android_webview_native_jni.target.darwin-mips.mk @@ -203,9 +203,7 @@ MY_CFLAGS := \ -fPIC \ -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/android_webview/native/android_webview_native_jni.target.linux-mips.mk b/android_webview/native/android_webview_native_jni.target.linux-mips.mk index ebd9ecf12f..69684f03e3 100644 --- a/android_webview/native/android_webview_native_jni.target.linux-mips.mk +++ b/android_webview/native/android_webview_native_jni.target.linux-mips.mk @@ -203,9 +203,7 @@ MY_CFLAGS := \ -fPIC \ -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/android_webview/native/webview_native.target.darwin-mips.mk b/android_webview/native/webview_native.target.darwin-mips.mk index 80ff66932e..4dff71a6b2 100644 --- a/android_webview/native/webview_native.target.darwin-mips.mk +++ b/android_webview/native/webview_native.target.darwin-mips.mk @@ -63,9 +63,7 @@ MY_CFLAGS := \ -fPIC \ -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 \ @@ -169,7 +167,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/android_webview/native/webview_native.target.linux-mips.mk b/android_webview/native/webview_native.target.linux-mips.mk index 80ff66932e..4dff71a6b2 100644 --- a/android_webview/native/webview_native.target.linux-mips.mk +++ b/android_webview/native/webview_native.target.linux-mips.mk @@ -63,9 +63,7 @@ MY_CFLAGS := \ -fPIC \ -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 \ @@ -169,7 +167,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 \ |