Bug 1123345 - Use MOZ_ICU_CFLAGS instead of in-tree paths for build with system icu. r=glandium

This commit is contained in:
Hector Zhao 2015-01-17 11:30:04 +08:00
parent e6c9145809
commit fe956ab5f2
3 changed files with 3 additions and 9 deletions

View File

@ -9,9 +9,8 @@ SOURCES += [
]
FINAL_LIBRARY = 'xul'
CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
LOCAL_INCLUDES += [
'../icu/source/common',
'../icu/source/i18n',
'../locale',
'../lwbrk',
'../strres',

View File

@ -11,10 +11,9 @@ UNIFIED_SOURCES += [
]
FINAL_LIBRARY = 'xul'
CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
LOCAL_INCLUDES += [
'..',
'../../icu/source/common',
'../../icu/source/i18n',
]
FAIL_ON_WARNINGS = True

View File

@ -56,8 +56,4 @@ LOCAL_INCLUDES += [
if CONFIG['ENABLE_INTL_API']:
# nsNumberControlFrame.cpp requires ICUUtils.h which in turn requires
# i18n/unum.h
LOCAL_INCLUDES += [
'../../intl/icu/source/common',
'../../intl/icu/source/i18n',
]
CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']