Bug 616020 - Use armeabi-v7a for thumb2 packages on Android. r=mwu a=blocking-fennec
authorMatt Brubeck <mbrubeck@mozilla.com>
Wed, 01 Dec 2010 16:28:17 -0800
changeset 58480 75d91c4ff0d8429723d5a2c9ba472a35bf5dce09
parent 58479 ae06445eeff1becaeb387c4be1c1378928fa49f4
child 58481 48657c9d5788fec9c62e69f77bb0050290107f61
push id17315
push usermbrubeck@mozilla.com
push dateThu, 02 Dec 2010 14:27:03 +0000
treeherdermozilla-central@75d91c4ff0d8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmwu, blocking-fennec
bugs616020
milestone2.0b8pre
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 616020 - Use armeabi-v7a for thumb2 packages on Android. r=mwu a=blocking-fennec
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -188,40 +188,46 @@ NON_DIST_FILES = \
 UPLOAD_EXTRA_FILES += gecko-unsigned-unaligned.apk
 
 include $(topsrcdir)/ipc/app/defs.mk
 
 ifdef MOZ_IPC
 DIST_FILES += $(MOZ_CHILD_PROCESS_NAME)
 endif
 
+ifdef MOZ_THUMB2
+ABI_DIR = armeabi-v7a
+else
+ABI_DIR = armeabi
+endif
+
 PKG_SUFFIX      = .apk
 INNER_MAKE_PACKAGE	= \
   rm -f $(_ABS_DIST)/gecko.ap_ && \
   ( cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && \
     rm -rf lib && \
-    mkdir -p lib/armeabi && \
+    mkdir -p lib/$(ABI_DIR) && \
     cp lib*.so lib && \
-    mv lib/libmozutils.so lib/armeabi && \
+    mv lib/libmozutils.so lib/$(ABI_DIR) && \
     rm -f lib.id && \
     for SOMELIB in lib/*.so ; \
     do \
       printf "`basename $$SOMELIB`:`$(_ABS_DIST)/host/bin/file_id $$SOMELIB`\n" >> lib.id ; \
     done && \
     $(ZIP) -r9D $(_ABS_DIST)/gecko.ap_ $(DIST_FILES) -x $(NON_DIST_FILES) ) && \
   rm -f $(_ABS_DIST)/gecko.apk && \
   $(APKBUILDER) $(_ABS_DIST)/gecko.apk -v $(APKBUILDER_FLAGS) -z $(_ABS_DIST)/gecko.ap_ -f $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/classes.dex && \
   cp $(_ABS_DIST)/gecko.apk $(_ABS_DIST)/gecko-unsigned-unaligned.apk && \
   $(JARSIGNER) $(_ABS_DIST)/gecko.apk && \
   $(ZIPALIGN) -f -v 4 $(_ABS_DIST)/gecko.apk $(PACKAGE)
 INNER_UNMAKE_PACKAGE	= \
   mkdir $(MOZ_PKG_DIR) && \
   cd $(MOZ_PKG_DIR) && \
   $(UNZIP) $(UNPACKAGE) && \
-  mv lib/armeabi/*.so . && \
+  mv lib/$(ABI_DIR)/*.so . && \
   mv lib/*.so . && \
   rm -rf lib
 endif
 ifeq ($(MOZ_PKG_FORMAT),DMG)
 ifndef _APPNAME
 ifdef MOZ_DEBUG
 _APPNAME	= $(MOZ_APP_DISPLAYNAME)Debug.app
 else