diff --git a/dom/media/encoder/moz.build b/dom/media/encoder/moz.build index 6def7f469856..853b0d6d3b9f 100644 --- a/dom/media/encoder/moz.build +++ b/dom/media/encoder/moz.build @@ -42,13 +42,16 @@ FINAL_LIBRARY = 'xul' # These includes are from Android JB, for use of MediaCodec. LOCAL_INCLUDES += ['/ipc/chromium/src'] -CXXFLAGS += [ - '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ - 'frameworks/native/opengl/include', - 'frameworks/native/include', - 'frameworks/av/include/media', + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '15': + LOCAL_INCLUDES += [ + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ + 'frameworks/av/include/media', + 'frameworks/native/include', + 'frameworks/native/opengl/include', + ] + ] -] include('/ipc/chromium/chromium-config.mozbuild') diff --git a/dom/media/omx/moz.build b/dom/media/omx/moz.build index aec361e2071c..543cd5e4d468 100644 --- a/dom/media/omx/moz.build +++ b/dom/media/omx/moz.build @@ -97,20 +97,26 @@ LOCAL_INCLUDES += [ '/ipc/chromium/src', ] -CXXFLAGS += [ - '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ - 'dalvik/libnativehelper/include/nativehelper', - 'frameworks/av/include/media', - '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/native/opengl/include', - 'frameworks/native/include', - 'hardware/libhardware/include/', +if CONFIG['ANDROID_VERSION'] == '15': + LOCAL_INCLUDES += [ + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ + 'dalvik/libnativehelper/include/nativehelper', + 'frameworks/base/include', + 'frameworks/base/include/binder', + 'frameworks/base/include/media', + 'frameworks/base/include/media/stagefright/openmax', + 'frameworks/base/include/utils', + 'frameworks/base/media/libstagefright/include', + 'hardware/libhardware/include', + ] ] +else: + LOCAL_INCLUDES += [ + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ + 'frameworks/av/include/media', + 'frameworks/native/include', + 'frameworks/native/opengl/include', + ] ] if CONFIG['ANDROID_VERSION'] > '15': diff --git a/dom/media/platforms/gonk/moz.build b/dom/media/platforms/gonk/moz.build index eb5f2b2c72c9..5dbc0a6705c8 100644 --- a/dom/media/platforms/gonk/moz.build +++ b/dom/media/platforms/gonk/moz.build @@ -33,7 +33,7 @@ if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']: FINAL_LIBRARY = 'xul' -CXXFLAGS += [ - '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ +LOCAL_INCLUDES += [ + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ 'frameworks/native/opengl/include',] ] diff --git a/dom/media/systemservices/moz.build b/dom/media/systemservices/moz.build index 74300776e71b..27a5f68ac7c1 100644 --- a/dom/media/systemservices/moz.build +++ b/dom/media/systemservices/moz.build @@ -40,12 +40,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': EXPORTS += ['OSXRunLoopSingleton.h'] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - CXXFLAGS += [ - '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ - 'frameworks/wilhelm/include', - 'system/media/wilhelm/include', + if CONFIG['ANDROID_VERSION'] >= '17': + LOCAL_INCLUDES += [ + '%' + '%s/frameworks/wilhelm/include' % CONFIG['ANDROID_SOURCE'], + ] + else: + LOCAL_INCLUDES += [ + '%' + '%s/system/media/wilhelm/include' % CONFIG['ANDROID_SOURCE'], ] - ] if CONFIG['_MSC_VER']: DEFINES['__PRETTY_FUNCTION__'] = '__FUNCSIG__' diff --git a/dom/system/gonk/moz.build b/dom/system/gonk/moz.build index 3552b6fb1eee..14c2d4e5455d 100644 --- a/dom/system/gonk/moz.build +++ b/dom/system/gonk/moz.build @@ -66,9 +66,9 @@ UNIFIED_SOURCES += [ ] if CONFIG['ANDROID_VERSION'] >= '17': - CXXFLAGS += ['-I%s/frameworks/av/media/mtp' % CONFIG['ANDROID_SOURCE']] + LOCAL_INCLUDES += ['%' + '%s/frameworks/av/media/mtp' % CONFIG['ANDROID_SOURCE']] else: - CXXFLAGS += ['-I%s/frameworks/base/media/mtp' % CONFIG['ANDROID_SOURCE']] + LOCAL_INCLUDES += ['%' + '%s/frameworks/base/media/mtp' % CONFIG['ANDROID_SOURCE']] if CONFIG['ENABLE_TESTS']: XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini'] diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build index 479c374f4d96..a13e401542ce 100644 --- a/gfx/angle/moz.build +++ b/gfx/angle/moz.build @@ -129,7 +129,7 @@ if CONFIG['GNU_CXX']: ] if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: - CXXFLAGS += ['-I\'%s/include/\'' % CONFIG['MOZ_DIRECTX_SDK_PATH']] + LOCAL_INCLUDES += ['%' + '%s/include/' % CONFIG['MOZ_DIRECTX_SDK_PATH']] DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True DEFINES['_HAS_EXCEPTIONS'] = 0 diff --git a/gfx/angle/src/libANGLE/moz.build b/gfx/angle/src/libANGLE/moz.build index b29440b033cd..d38c3de81d6f 100644 --- a/gfx/angle/src/libANGLE/moz.build +++ b/gfx/angle/src/libANGLE/moz.build @@ -277,7 +277,7 @@ if CONFIG['GNU_CXX']: ] if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: - CXXFLAGS += ['-I\'%s/include/\'' % CONFIG['MOZ_DIRECTX_SDK_PATH']] + LOCAL_INCLUDES += ['%' + '%s/include/' % CONFIG['MOZ_DIRECTX_SDK_PATH']] DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True DEFINES['_HAS_EXCEPTIONS'] = 0 diff --git a/gfx/angle/src/libEGL/moz.build b/gfx/angle/src/libEGL/moz.build index d4d25ab5784b..f4cd9ebffd79 100644 --- a/gfx/angle/src/libEGL/moz.build +++ b/gfx/angle/src/libEGL/moz.build @@ -33,7 +33,7 @@ if CONFIG['GNU_CXX']: ] if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: - CXXFLAGS += ['-I\'%s/include/\'' % CONFIG['MOZ_DIRECTX_SDK_PATH']] + LOCAL_INCLUDES += ['%' + '%s/include/' % CONFIG['MOZ_DIRECTX_SDK_PATH']] DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True DEFINES['_HAS_EXCEPTIONS'] = 0 diff --git a/gfx/angle/src/libGLESv2/moz.build b/gfx/angle/src/libGLESv2/moz.build index 96c840389c28..561b266f4845 100644 --- a/gfx/angle/src/libGLESv2/moz.build +++ b/gfx/angle/src/libGLESv2/moz.build @@ -39,7 +39,7 @@ if CONFIG['GNU_CXX']: ] if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: - CXXFLAGS += ['-I\'%s/include/\'' % CONFIG['MOZ_DIRECTX_SDK_PATH']] + LOCAL_INCLUDES += ['%' + '%s/include/' % CONFIG['MOZ_DIRECTX_SDK_PATH']] DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True DEFINES['_HAS_EXCEPTIONS'] = 0 diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index 6a0b78e62f9e..2a10bbf99bed 100644 --- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -86,7 +86,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': UNIFIED_SOURCES += ['SharedSurfaceGralloc.cpp'] EXPORTS += ['SharedSurfaceGralloc.h'] LOCAL_INCLUDES += ['/widget/gonk'] - CXXFLAGS += ['-I%s/%s' % (CONFIG['ANDROID_SOURCE'], 'hardware/libhardware/include')] + LOCAL_INCLUDES += ['%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], 'hardware/libhardware/include')] if gl_provider == 'CGL': # These files include Mac headers that are unfriendly to unified builds diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index 5853c319b0a5..a2a404df4b2e 100644 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -228,11 +228,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': 'opengl/GrallocTextureHost.cpp', ] LOCAL_INCLUDES += ['/widget/gonk'] - CXXFLAGS += [ - '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ - 'system/core/libsync/include' - ] - ] + if CONFIG['ANDROID_VERSION'] >= '21': + LOCAL_INCLUDES += [ + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ + 'system/core/libsync/include' + ] + ] SOURCES += [ 'ipc/ShadowLayerUtilsGralloc.cpp', ] @@ -403,14 +404,21 @@ if CONFIG['MOZ_DEBUG']: if CONFIG['MOZ_ENABLE_D3D10_LAYER']: DEFINES['MOZ_ENABLE_D3D10_LAYER'] = True -CXXFLAGS += [ - '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ - 'frameworks/base/include/media/stagefright', - 'frameworks/base/include/media/stagefright/openmax', - 'frameworks/av/include/media/stagefright', - 'frameworks/native/include/media/openmax', +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': + if CONFIG['ANDROID_VERSION'] > '17': + includes = [ + 'frameworks/av/include/media/stagefright', + 'frameworks/native/include/media/openmax', + ] + else: + includes = [ + 'frameworks/base/include/media/stagefright', + 'frameworks/base/include/media/stagefright/openmax', + ] + + LOCAL_INCLUDES += [ + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in includes ] -] if CONFIG['ENABLE_TESTS']: DIRS += ['apz/test/gtest'] diff --git a/hal/moz.build b/hal/moz.build index ba9abffd8567..a046bdcd43f9 100644 --- a/hal/moz.build +++ b/hal/moz.build @@ -174,7 +174,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - CXXFLAGS += ['-I%s/hardware/libhardware_legacy/include' % CONFIG['ANDROID_SOURCE']] + LOCAL_INCLUDES += ['%' + '%s/hardware/libhardware_legacy/include' % CONFIG['ANDROID_SOURCE']] CFLAGS += CONFIG['GLIB_CFLAGS'] CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS'] diff --git a/layout/build/moz.build b/layout/build/moz.build index 83318f31b36d..6272b01d4a43 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -85,17 +85,18 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': LOCAL_INCLUDES += [ '/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['ANDROID_VERSION'] == '15': + LOCAL_INCLUDES += [ + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ + 'dalvik/libnativehelper/include/nativehelper', + 'frameworks/base/include', + 'frameworks/base/include/binder', + 'frameworks/base/include/media', + 'frameworks/base/include/media/stagefright/openmax', + 'frameworks/base/include/utils', + 'frameworks/base/media/libstagefright/include', + ] ] - ] if CONFIG['MOZ_B2G_FM']: LOCAL_INCLUDES += [ diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build index 3a11a25c0905..a01a4ced2494 100644 --- a/media/libcubeb/src/moz.build +++ b/media/libcubeb/src/moz.build @@ -63,12 +63,14 @@ if CONFIG['OS_TARGET'] == 'Android': FINAL_LIBRARY = 'gkmedias' if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - CFLAGS += [ - '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ - 'frameworks/wilhelm/include', - 'system/media/wilhelm/include', + if CONFIG['ANDROID_VERSION'] >= '17': + LOCAL_INCLUDES += [ + '%' + '%s/frameworks/wilhelm/include' % CONFIG['ANDROID_SOURCE'], + ] + else: + LOCAL_INCLUDES += [ + '%' + '%s/system/media/wilhelm/include' % CONFIG['ANDROID_SOURCE'], ] - ] CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] diff --git a/media/omx-plugin/moz.build b/media/omx-plugin/moz.build index 529bab2077a5..12b939effabc 100644 --- a/media/omx-plugin/moz.build +++ b/media/omx-plugin/moz.build @@ -33,20 +33,22 @@ if CONFIG['GNU_CXX']: 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', - ] - ] + if CONFIG['ANDROID_VERSION'] == '15': + LOCAL_INCLUDES += [ + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ + 'dalvik/libnativehelper/include/nativehelper', + 'frameworks/base/include/', + 'frameworks/base/include/binder/', + 'frameworks/base/include/media/', + 'frameworks/base/include/media/stagefright/openmax', + 'frameworks/base/include/utils/', + 'frameworks/base/media/libstagefright/include', + 'frameworks/base/native/include', + 'hardware/libhardware/include', + 'system/core/include', + ] + ] + EXTRA_DSO_LDOPTS += [ '-lutils', '-lstagefright', diff --git a/netwerk/dns/mdns/libmdns/moz.build b/netwerk/dns/mdns/libmdns/moz.build index 1615f3a070eb..2012f423d143 100644 --- a/netwerk/dns/mdns/libmdns/moz.build +++ b/netwerk/dns/mdns/libmdns/moz.build @@ -17,8 +17,8 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] >= '16 'nsDNSServiceDiscovery.cpp', ] - CXXFLAGS += [ - '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ + LOCAL_INCLUDES += [ + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ 'external/mdnsresponder/mDNSShared', ] ] diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build index d1d259e12183..49ed50ef72d0 100644 --- a/netwerk/dns/moz.build +++ b/netwerk/dns/moz.build @@ -67,7 +67,7 @@ LOCAL_INCLUDES += [ ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19': - CXXFLAGS += ['-I%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']] + LOCAL_INCLUDES += ['%' + '%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']] if CONFIG['ENABLE_INTL_API']: DEFINES['IDNA2008'] = True diff --git a/netwerk/protocol/rtsp/moz.build b/netwerk/protocol/rtsp/moz.build index 655507dac8f3..13d491cd1d56 100644 --- a/netwerk/protocol/rtsp/moz.build +++ b/netwerk/protocol/rtsp/moz.build @@ -66,8 +66,8 @@ 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']] + LOCAL_INCLUDES += ['%' + '%s/frameworks/base/media/libstagefright/mpeg2ts' % CONFIG['ANDROID_SOURCE']] else: - CXXFLAGS += ['-I%s/frameworks/av/media/libstagefright/mpeg2ts' % CONFIG['ANDROID_SOURCE']] + LOCAL_INCLUDES += ['%' + '%s/frameworks/av/media/libstagefright/mpeg2ts' % CONFIG['ANDROID_SOURCE']] CXXFLAGS += ['-Wno-multichar'] diff --git a/widget/gonk/libdisplay/moz.build b/widget/gonk/libdisplay/moz.build index 3cb1426eec29..25dbe859abce 100644 --- a/widget/gonk/libdisplay/moz.build +++ b/widget/gonk/libdisplay/moz.build @@ -52,12 +52,18 @@ DEFINES['XPCOM_GLUE'] = True DISABLE_STL_WRAPPING = True -CXXFLAGS += [ - '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ - 'frameworks/native/include/gui', - 'frameworks/native/opengl/include', +if CONFIG['ANDROID_VERSION'] > '15': + LOCAL_INCLUDES += [ + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ + 'frameworks/native/include/gui', + 'frameworks/native/opengl/include', + 'system/core/libsuspend/include', + ] + ] + +LOCAL_INCLUDES += [ + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ 'hardware/libhardware/include', 'hardware/libhardware_legacy/include', - 'system/core/libsuspend/include', ] ] diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build index 69cd04676517..ae3bd58a4b04 100644 --- a/widget/gonk/moz.build +++ b/widget/gonk/moz.build @@ -96,10 +96,14 @@ if CONFIG['ANDROID_VERSION'] != '15': if CONFIG['MOZ_OMX_DECODER']: DEFINES['MOZ_OMX_DECODER'] = True -CXXFLAGS += [ - '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ +if CONFIG['ANDROID_VERSION'] > '15': + LOCAL_INCLUDES += [ + '%' + '%s/frameworks/native/opengl/include' % CONFIG['ANDROID_SOURCE'], + ] + +LOCAL_INCLUDES += [ + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ 'hardware/libhardware/include', 'hardware/libhardware_legacy/include', - 'frameworks/native/opengl/include', ] ]