From daad0dc7c514023a11807cff0d4012cd87adbf7a Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Wed, 4 Dec 2013 04:53:28 +0000 Subject: Update makefiles after merge of Chromium at 238573 This commit was generated by merge_from_chromium.py. Change-Id: I7eedef5ad13f3b9541c581caa7ed22e4ea38ed51 --- ft2.target.linux-x86.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ft2.target.linux-x86.mk') diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 52a8b87..8f7b071 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -94,6 +94,7 @@ MY_DEFS_Debug := \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ @@ -184,6 +185,7 @@ MY_DEFS_Release := \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ -- cgit v1.2.3