diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-26 18:47:49 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-26 18:47:49 +0100 |
| commit | d4a8979cfe5e3aa08b5bad2360f27f8ffafcee44 (patch) | |
| tree | d542952b35d8b5d2f870e78eb5d7e11fc59fd8f9 | |
| parent | ad274c2e39e0557ffc47bc44e3c733029db9f234 (diff) | |
| download | freetype-d4a8979cfe5e3aa08b5bad2360f27f8ffafcee44.tar.gz | |
Update makefiles after merge of Chromium at r208345
This commit was generated by merge_from_chromium.py.
Change-Id: I908d67f8908a07f8c03067ffbdefd4e70ab57d5b
| -rw-r--r-- | ft2.target.darwin-mips.mk | 4 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 324b649..491c615 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -61,7 +61,7 @@ MY_CFLAGS := \ -mhard-float \ -mips32r2 \ -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google/code/master-chromium/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -141,7 +141,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google/code/master-chromium/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 324b649..491c615 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -61,7 +61,7 @@ MY_CFLAGS := \ -mhard-float \ -mips32r2 \ -Wa,-mips32r2 \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google/code/master-chromium/external/chromium_org/mipsel-sysroot/sysroot \ -ffunction-sections \ -funwind-tables \ -g \ @@ -141,7 +141,7 @@ LOCAL_LDFLAGS := \ -fPIC \ -EL \ -Wl,--no-keep-memory \ - --sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \ + --sysroot=/usr/local/google/code/master-chromium/external/chromium_org/mipsel-sysroot/sysroot \ \ -nostdlib \ -Wl,--no-undefined \ |