Bug 805700 - Part3: Build changes for honeycomb libomxplugin libraries on Android - r=khuey
authorChris Double <chris.double@double.co.nz>
Fri, 30 Nov 2012 16:05:50 +1300
changeset 114639 06dfb6d9f0c085172f902ee3791207ec553bb4fe
parent 114638 d2dd27b5985c5456228cd29b4fdcac07f4267174
child 114640 04ebcfd56e6eb3290798382afc8da680a2984988
push id23926
push userryanvm@gmail.com
push dateSat, 01 Dec 2012 15:27:30 +0000
treeherdermozilla-central@ecdf0e332f17 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs805700
milestone20.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 805700 - Part3: Build changes for honeycomb libomxplugin libraries on Android - r=khuey
toolkit/components/downloads/test/unit/test_private_resume.js
toolkit/mozapps/installer/packager.mk
toolkit/toolkit-tiers.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -342,17 +342,17 @@ INNER_ROBOCOP_PACKAGE= \
   $(JARSIGNER) $(_ABS_DIST)/robocop-raw.apk && \
   $(ZIPALIGN) -f -v 4 $(_ABS_DIST)/robocop-raw.apk $(_ABS_DIST)/robocop.apk
 endif
 else
 INNER_ROBOCOP_PACKAGE=echo 'Testing is disabled - No Robocop for you'
 endif
 
 ifdef MOZ_OMX_PLUGIN
-OMX_PLUGIN_NAMES = libomxplugin.so libomxplugingb.so libomxplugingb235.so
+OMX_PLUGIN_NAMES = libomxplugin.so libomxplugingb.so libomxplugingb235.so libomxpluginhc.so
 else
 OMX_PLUGIN_NAMES =
 endif
 
 PKG_SUFFIX      = .apk
 INNER_MAKE_PACKAGE	= \
   $(foreach lib,$(SZIP_LIBRARIES),host/bin/szip $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(lib) $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(lib:.so=.sz) && mv $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(lib:.so=.sz) $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(lib) && ) \
   make -C $(GECKO_APP_AP_PATH) gecko.ap_ && \
@@ -380,16 +380,17 @@ INNER_MAKE_PACKAGE	= \
 INNER_UNMAKE_PACKAGE	= \
   mkdir $(MOZ_PKG_DIR) && \
   pushd $(MOZ_PKG_DIR) && \
   $(UNZIP) $(UNPACKAGE) && \
   mv lib/$(ABI_DIR)/libmozglue.so . && \
   mv lib/$(ABI_DIR)/libomxplugin.so . && \
   mv lib/$(ABI_DIR)/libomxplugingb.so . && \
   mv lib/$(ABI_DIR)/libomxplugingb235.so . && \
+  mv lib/$(ABI_DIR)/libomxpluginhc.so . && \
   mv lib/$(ABI_DIR)/*plugin-container* $(MOZ_CHILD_PROCESS_NAME) && \
   rm -rf lib/$(ABI_DIR) && \
   popd
 endif
 
 ifeq ($(MOZ_PKG_FORMAT),DMG)
 PKG_SUFFIX	= .dmg
 PKG_DMG_FLAGS	=
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -168,16 +168,18 @@ tier_platform_dirs += \
 		media/omx-plugin/lib/ics/libutils \
 		media/omx-plugin/lib/ics/libstagefright \
 		media/omx-plugin/lib/gb/libutils \
 		media/omx-plugin/lib/gb/libstagefright \
 		media/omx-plugin/lib/gb235/libstagefright \
 		media/omx-plugin \
 		media/omx-plugin/gb \
 		media/omx-plugin/gb235 \
+		media/omx-plugin/lib/hc/libstagefright \
+		media/omx-plugin/hc \
 		$(NULL)
 endif
 
 ifndef MOZ_NATIVE_PNG
 tier_platform_dirs += media/libpng
 endif
 
 ifdef ENABLE_TESTS