Bug 977964 - Move some flags to moz.build; r=glandium

hal/Makefile.in

@@ -7,7 +7,3 @@ include $(topsrcdir)/config/rules.mk
 
 CFLAGS          += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
 CXXFLAGS        += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
-
-ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-  LOCAL_INCLUDES += -I$(ANDROID_SOURCE)/hardware/libhardware_legacy/include
-endif

hal/moz.build

@@ -188,3 +188,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
         '/widget/gonk',
         '/widget/xpwidgets'
     ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    CXXFLAGS += ['-I%s/hardware/libhardware_legacy/include' % CONFIG['ANDROID_SOURCE']]

media/omx-plugin/Makefile.in

@@ -17,29 +17,11 @@ STL_FLAGS =
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef GNU_CXX
-# Stagefright header files define many multichar constants.
-CXXFLAGS += -Wno-multichar
-endif
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
 EXTRA_DSO_LDOPTS += \
                -lutils -lstagefright -lmedia -lstagefright_omx -lbinder -lui \
                -lhardware -lcutils \
 		$(NULL)
-
-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 \
-                -I$(ANDROID_SOURCE)/frameworks/base/native/include \
-                -I$(ANDROID_SOURCE)/system/core/include \
-                -I$(ANDROID_SOURCE)/hardware/libhardware/include \
-                $(NULL)
 else
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/ics/libutils \

media/omx-plugin/moz.build

@@ -33,3 +33,23 @@ else:
         'include/ics',
         'include/ics/media/stagefright/openmax',
     ]
+
+if CONFIG['GNU_CXX']:
+    # Stagefright header files define many multichar constants.
+    CXXFLAGS += ['-Wno-multichar']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == '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',
+             'frameworks/base/native/include',
+             'system/core/include',
+             'hardware/libhardware/include',
+         ]
+    ]

netwerk/protocol/rtsp/Makefile.in

@@ -1,19 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/rules.mk
-
-ifeq ($(ANDROID_VERSION),$(findstring $(ANDROID_VERSION),15))
-CXXFLAGS += \
-  -I$(ANDROID_SOURCE)/frameworks/base/media/libstagefright/mpeg2ts \
-  $(NULL)
-else
-CXXFLAGS += \
-  -I$(ANDROID_SOURCE)/frameworks/av/media/libstagefright/mpeg2ts \
-  $(NULL)
-endif
-
-CXXFLAGS += \
-  -Wno-multichar \
-  $(NULL)

netwerk/protocol/rtsp/moz.build

@@ -63,3 +63,10 @@ LOCAL_INCLUDES += [
 
 for var in ('IMPL_NS_NET', 'FORCE_PR_LOG'):
     DEFINES[var] = True
+
+if CONFIG['ANDROID_VERSION'] == '15':
+    CXXFLAGS += ['-I%s/frameworks/base/media/libstagefright/mpeg2ts' % CONFIG['ANDROID_SOURCE']]
+else:
+    CXXFLAGS += ['-I%s/frameworks/av/media/libstagefright/mpeg2ts' % CONFIG['ANDROID_SOURCE']]
+
+CXXFLAGS += ['-Wno-multichar']

toolkit/components/downloads/Makefile.in

@@ -5,5 +5,5 @@
 
 include $(topsrcdir)/config/rules.mk
 
-CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
+CXXFLAGS += $(TK_CFLAGS)
 

toolkit/components/downloads/moz.build

@@ -57,3 +57,4 @@ LOCAL_INCLUDES += [
     '../protobuf',
 ]
 
+DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True

toolkit/components/protobuf/Makefile.in

@@ -5,4 +5,4 @@
 
 include $(topsrcdir)/config/rules.mk
 
-CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
+CXXFLAGS += $(TK_CFLAGS)

toolkit/components/protobuf/moz.build

@@ -44,3 +44,5 @@ UNIFIED_SOURCES += [
 ]
 
 FINAL_LIBRARY = 'toolkitcomps'
+
+DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True