diff options
| author | Torne (Richard Coles) <torne@google.com> | 2012-12-05 11:27:20 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2012-12-05 11:27:20 +0000 |
| commit | ffca56dda06b22b8358f31508a131d3aea5bd932 (patch) | |
| tree | c9f8f5caf5f4e8327f2caaec56928755bc11d5c5 | |
| parent | daff1761fc4be5c6686c9f8b75b8862b7cb02f10 (diff) | |
| download | freetype-ffca56dda06b22b8358f31508a131d3aea5bd932.tar.gz | |
Update makefiles after merge of Chromium at r171194
This commit was generated by merge_from_chromium.py.
Change-Id: Ic55b3495de4a03036f35a53d73881c77b5b8da5f
| -rw-r--r-- | ft2.target.linux-arm.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 6ea7437..2053a3e 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -110,7 +110,6 @@ MY_DEFS := \ '-DUSE_STLPORT=1' \ '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ '-DCHROME_SYMBOLS_ID=""' \ - '-DANDROID_UPSTREAM_BRINGUP=1' \ '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ '-D_DEBUG' |