Bug 981290 - Rewrite content/media/omx/Makefile.in in moz.build; r=mshal
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 10 Mar 2014 20:12:37 -0400
changeset 191136 9ea150674ac04abd9f7ae03f89aa2fe8a0a6b88e
parent 191135 bf9adc1ce324ded8a2f931c7322181e7b67c9240
child 191137 17f859022c1201dad1d7fef41cac793ca29242a6
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs981290
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 981290 - Rewrite content/media/omx/Makefile.in in moz.build; r=mshal
content/media/omx/Makefile.in
content/media/omx/moz.build
deleted file mode 100644
--- a/content/media/omx/Makefile.in
+++ /dev/null
@@ -1,22 +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
-
-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)
-
-# These includes are for Android JB, using MediaCodec on OMXCodec.
-INCLUDES	+= \
-		-I$(ANDROID_SOURCE)/frameworks/native/opengl/include/ \
-		-I$(ANDROID_SOURCE)/frameworks/native/include/ \
-		-I$(ANDROID_SOURCE)/frameworks/av/include/media/ \
-		$(NULL)
--- a/content/media/omx/moz.build
+++ b/content/media/omx/moz.build
@@ -40,8 +40,23 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     '/ipc/chromium/src',
     'mediaresourcemanager',
 ]
 
+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',
+    ]
+]
+