Bug 875013 - Remove VPATH in media/libvpx; r=joey
authorMike Shal <mshal@mozilla.com>
Thu, 09 Jan 2014 14:43:29 -0500
changeset 162968 92d510a09a8cb5c8f68fdc3f97f14172d1eb77a5
parent 162967 f6e3cd08cb6edf166047a03e65f9c6bd39930a63
child 162969 8945b2a33ba9a619ee50dff6e10e5b6458022bd2
push id25975
push userryanvm@gmail.com
push dateFri, 10 Jan 2014 19:46:47 +0000
treeherderautoland@e89afc241513 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoey
bugs875013
milestone29.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 875013 - Remove VPATH in media/libvpx; r=joey
media/libvpx/Makefile.in
media/libvpx/moz.build
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -10,21 +10,16 @@ ASM_SUFFIX=$(VPX_ASM_SUFFIX)
 
 ifdef VPX_ARM_ASM
 # Building on an ARM platform with a supported assembler, include
 # the optimized assembly in the build.
 
 ifeq ($(OS_TARGET),Android)
 # For cpu-features.h
 LOCAL_INCLUDES += -I$(ANDROID_NDK)/sources/android/cpufeatures
-ifndef MOZ_WEBRTC
-# For cpu-features.c
-VPATH += $(ANDROID_NDK)/sources/android/cpufeatures
-CSRCS += cpu-features.c
-endif
 endif
 
 ASM_OFFSETS = vpx_scale_asm_offsets.asm vp8_asm_enc_offsets.asm
 
 
 ifdef VPX_AS_CONVERSION
 # The ARM asm is written in ARM RVCT syntax, but we actually build it with
 # gas using GNU syntax. Add some rules to perform the conversion.
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -77,8 +77,13 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
 FINAL_LIBRARY = 'gkmedias'
 
 DEFINES['HAVE_CONFIG_H'] = 'vpx_config.h'
 
 if CONFIG['OS_TARGET'] == 'Android':
     # Older versions of the Android NDK don't pre-define anything to indicate
     # the OS they're on, so do it for them.
     DEFINES['__linux__'] = True
+
+    if not CONFIG['MOZ_WEBRTC']:
+        SOURCES += [
+            '%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'],
+        ]