1318959 - [Gamepad] #ifdef MOZ_GAMEPAD omission in widget/android/nsAppShell.cpp

Status: RESOLVED WORKSFORME

(Firefox Build System :: Android Studio and Gradle Integration, defect)

Description

[altblitz]

Attachment: Fix compilation with --enable-gamepad=no flag

User Agent: Mozilla/5.0 (X11; Linux x86_64; rv:50.0) Gecko/20100101 Firefox/50.0
Build ID: 20161115132849

Steps to reproduce:

Build target:
ac_add_options --enable-application=mobile/android
ac_add_options --enable-gamepad=no

Build source:
fennec-50.0.source.tar.xz


Actual results:

 2:29.99 In file included from /var/spool/makepkg/firefox-50.0/obj-arm-linux-androideabi/widget/android/Unified_cpp_widget_android0.cpp:92:0:
 2:30.00 /var/spool/makepkg/firefox-50.0/widget/android/nsAppShell.cpp:74:23: error: 'GamepadPlatformService' in namespace 'mozilla::dom' does not
 name a type
 2:30.00  typedef mozilla::dom::GamepadPlatformService GamepadPlatformService;
 2:30.00                        ^
 2:30.00
 2:30.01 In the directory  /var/spool/makepkg/firefox-50.0/obj-arm-linux-androideabi/widget/android
 2:30.01 The following command failed to execute properly:
 2:30.01 /usr/bin/ccache /opt/android/android-ndk-r11b/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -s
td=gnu++11 -o Unified_cpp_widget_android0.o -c -I/var/spool/makepkg/firefox-50.0/obj-arm-linux-androideabi/dist/stl_wrappers -I/var/spool/makepkg/
firefox-50.0/obj-arm-linux-androideabi/dist/system_wrappers -include /var/spool/makepkg/firefox-50.0/config/gcc_hidden.h -DNDEBUG=1 -DTRIMMED=1 -D
OS_POSIX=1 -DOS_LINUX=1 -DSTATIC_EXPORTABLE_JS_API -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -I/var/spool/makepkg/firefox-50.0/widget/android -I/var/sp
ool/makepkg/firefox-50.0/obj-arm-linux-androideabi/widget/android -I/var/spool/makepkg/firefox-50.0/obj-arm-linux-androideabi/ipc/ipdl/_ipdlheader
s -I/var/spool/makepkg/firefox-50.0/ipc/chromium/src -I/var/spool/makepkg/firefox-50.0/ipc/glue -I/var/spool/makepkg/firefox-50.0/docshell/base -I
/var/spool/makepkg/firefox-50.0/dom/base -I/var/spool/makepkg/firefox-50.0/dom/system/android -I/var/spool/makepkg/firefox-50.0/netwerk/base -I/va
r/spool/makepkg/firefox-50.0/netwerk/cache -I/var/spool/makepkg/firefox-50.0/widget -I/var/spool/makepkg/firefox-50.0/obj-arm-linux-androideabi/di
st/include -I/var/spool/makepkg/firefox-50.0/obj-arm-linux-androideabi/dist/include/nspr -I/var/spool/makepkg/firefox-50.0/obj-arm-linux-androidea
bi/dist/include/nss -fPIC -DMOZILLA_CLIENT -include /var/spool/makepkg/firefox-50.0/obj-arm-linux-androideabi/mozilla-config.h -MD -MP -MF .deps/U
nified_cpp_widget_android0.o.pp -idirafter /opt/android/android-ndk-r11b/platforms/android-9/arch-arm/usr/include -D_FORTIFY_SOURCE=2 -Wall -Wc++1
1-compat -Wempty-body -Wignored-qualifiers -Woverloaded-virtual -Wpointer-arith -Wsign-compare -Wtype-limits -Wunreachable-code -Wwrite-strings -W
thread-safety -Wno-invalid-offsetof -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=array-bounds -fno-short-enums -fn
o-exceptions -O2 -pipe -fdiagnostics-color -fstack-protector-strong -O2 -pipe -fdiagnostics-color -fstack-protector-strong -O2 -pipe -fdiagnostics
-color -fstack-protector-strong -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -march=armv7-a -mthumb -mfpu=vfp -mfloat-abi=softfp -mno-unaligned-access -I/opt/android
/android-ndk-r11b/sources/android/support/include -I/opt/android/android-ndk-r11b/sources/cxx-stl/llvm-libc++/libcxx/include -I/opt/android/androi
d-ndk-r11b/sources/cxx-stl/llvm-libc++abi/libcxxabi/include -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fn
o-exceptions -fno-math-errno -pipe -g0 -O2 -fomit-frame-pointer -Wno-error=shadow /var/spool/makepkg/firefox-50.0/obj-arm-linux-androideabi/widget
/android/Unified_cpp_widget_android0.cpp
 2:30.01 make[5]: *** [/var/spool/makepkg/firefox-50.0/config/rules.mk:935: Unified_cpp_widget_android0.o] Error 1
 2:30.01 make[4]: *** [/var/spool/makepkg/firefox-50.0/config/recurse.mk:71: widget/android/target] Error 2
 2:30.01 make[4]: *** Waiting for unfinished jobs....



Expected results:

Build succeeds with attached patch.

Comment 1

[Kevin Brosnan [Ex-Mozilla]]

Ted are you the right person to review this?

Comment 2

[(not currently active) Ted Mielczarek]

I could, but bug 1315896 is going to remove MOZ_GAMEPAD anyway. We'll still support --disable-gamepad, it will just build a dummy gamepad backend, and the ifdefs will be gone.

Comment 3

[(not currently active) Ted Mielczarek]

bug 1315896 actually removed --disable-gamepad.