Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 20:22:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 981292 - Move the CXXFLAGS variable in layout/build/Makefile.in to moz.build; r=mshal

Browse Source 
--HG--
extra : rebase_source : 7c9e8dc076aeffe833d84c824be5e6771935373a
This commit is contained in:
Ehsan Akhgari 2014-03-10 20:13:57 -04:00
parent 3d7ed243aa
commit 5c08bd3d28
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/build/Makefile.in
View File

@ -13,15 +13,3 @@ include $(topsrcdir)/config/rules.mk
ifdef MOZ_GSTREAMER ifdef MOZ_GSTREAMER
CXXFLAGS += $(GSTREAMER_CFLAGS) CXXFLAGS += $(GSTREAMER_CFLAGS)
endif endif
ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
CXXFLAGS += \
-I$(ANDROID_SOURCE)/dalvik/libnativehelper/include/nativehelper \
-I$(ANDROID_SOURCE)/frameworks/base/include/ \
-I$(ANDROID_SOURCE)/frameworks/base/include/binder/ \
-I$(ANDROID_SOURCE)/frameworks/base/include/utils/ \
-I$(ANDROID_SOURCE)/frameworks/base/include/media/ \
-I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright/openmax \
-I$(ANDROID_SOURCE)/frameworks/base/media/libstagefright/include \
$(NULL)
endif

11
layout/build/moz.build
View File

@ -102,6 +102,17 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
'/dom/system/gonk', '/dom/system/gonk',
] ]
CXXFLAGS += [
'-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
'dalvik/libnativehelper/include/nativehelper',
'frameworks/base/include',
'frameworks/base/include/binder',
'frameworks/base/include/utils',
'frameworks/base/include/media',
'frameworks/base/include/media/stagefright/openmax',
'frameworks/base/media/libstagefright/include',
]
]
if CONFIG['MOZ_B2G_FM']: if CONFIG['MOZ_B2G_FM']:
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [