diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-06-28 18:35:04 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-06-28 18:35:04 +0000 |
| commit | 9076ced74c397000a03c47a48c092983f1074240 (patch) | |
| tree | f6bb785b5c24738aaca53b7cee973839ce267d9a | |
| parent | b1bb89721d57070210dd2ac1e86f5a42995b3b68 (diff) | |
| download | openssl-9076ced74c397000a03c47a48c092983f1074240.tar.gz | |
Update makefiles after merge of Chromium at r209196
This commit was generated by merge_from_chromium.py.
Change-Id: I551d904a255d83a0be889a01ab4084782f65192b
| -rw-r--r-- | openssl.target.darwin-mips.mk | 6 | ||||
| -rw-r--r-- | openssl.target.linux-mips.mk | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk index d57fb94..f4a6779 100644 --- a/openssl.target.darwin-mips.mk +++ b/openssl.target.darwin-mips.mk @@ -590,7 +590,6 @@ MY_CFLAGS_Debug := \ -Wno-format \ -EL \ -mhard-float \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -684,7 +683,6 @@ MY_CFLAGS_Release := \ -Wno-format \ -EL \ -mhard-float \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -774,8 +772,6 @@ LOCAL_LDFLAGS_Debug := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ - \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ @@ -791,8 +787,6 @@ LOCAL_LDFLAGS_Release := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ - \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk index d57fb94..f4a6779 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-mips.mk @@ -590,7 +590,6 @@ MY_CFLAGS_Debug := \ -Wno-format \ -EL \ -mhard-float \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -684,7 +683,6 @@ MY_CFLAGS_Release := \ -Wno-format \ -EL \ -mhard-float \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -774,8 +772,6 @@ LOCAL_LDFLAGS_Debug := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ - \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ @@ -791,8 +787,6 @@ LOCAL_LDFLAGS_Release := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ - \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ |