708708 - [Skia] builds the arm code for x86 Android

Status: RESOLVED DUPLICATE of bug 712870

(Firefox for Android Graveyard :: General, defect, P5)

Description

[Thomas G Eaton]

Attachment: moz_x86_android

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

Steps to reproduce:

I tried to build/run Fennec for x86 Android


Actual results:

It failed to build.  I made various changes to the mozconfig and some source files until it built.  Then it crashed with seg faults due to failing to load DLLs.  I resolved those issues and this is one of the issues.  

Specific to this bug, it built the Skia arm libraries for arm instead of the SSE libraries for x86.  


Expected results:

It should have built and run on x86 after changing the mozconfig to use the x86 Android NDK.

Comment 1

[Thomas G Eaton]

Here's the fix, but it would break the ARM Android build, so it needs to be modified to check a platform flag to set the correct source to build.

diff -r aa6ad7ab9b43 gfx/skia/Makefile.in
--- a/gfx/skia/Makefile.in	Mon Nov 28 10:34:54 2011 +0000
+++ b/gfx/skia/Makefile.in	Tue Dec 06 08:33:09 2011 -0800
@@ -312,12 +312,13 @@
 
 ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += \
-	SkBitmapProcState_opts_arm.cpp \
-	SkBlitRow_opts_arm.cpp \
+	SkBitmapProcState_opts_SSE2.cpp \
+	SkBlitRow_opts_SSE2.cpp \
+	SkUtils_opts_SSE2.cpp \
+	opts_check_SSE2.cpp \
 	SkFontHost_FreeType.cpp \
 	SkFontHost_android.cpp \
 	SkFontHost_gamma.cpp \
-	SkUtils_opts_none.cpp \
 	SkMMapStream.cpp \
 	SkTime_Unix.cpp \
 	$(NULL)

Comment 2

[Doug Turner (:dougt)]

thomas, can you attach such a patch that fixes x86 without killing arm?

Comment 3

[Brad Lassey [:blassey] (use needinfo?)]

just to note, we're happy to review and take the patches but its not a priority for the upcoming release