Bug 745145, part 0a: Use the normal plugin-container for gonk. r=mwu
authorChris Jones <jones.chris.g@gmail.com>
Tue, 08 May 2012 14:36:07 -0700
changeset 95795 23d963bae8592f84a7b888931849d559384289cd
parent 95794 ef3c645e854860a067dc83a703847696a5484406
child 95796 94ebe5e63dd264166d3c082c21b20a14c11d1383
push id1439
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 20:19:22 +0000
treeherdermozilla-aurora@ea74834dccd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmwu
bugs745145
milestone15.0a1
Bug 745145, part 0a: Use the normal plugin-container for gonk. r=mwu
ipc/app/Makefile.in
ipc/app/defs.mk
--- a/ipc/app/Makefile.in
+++ b/ipc/app/Makefile.in
@@ -50,17 +50,17 @@ PROGRAM = $(MOZ_CHILD_PROCESS_NAME)
 ifneq ($(dir $(PROGRAM)),./)
   GENERATED_DIRS = $(dir $(PROGRAM))
 endif
 
 CPPSRCS = \
   MozillaRuntimeMain.cpp \
   $(NULL)
 
-ifeq (Android,$(OS_TARGET))
+ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 WRAP_LDFLAGS =
 CPPSRCS = MozillaRuntimeMainAndroid.cpp
 else
 LIBS += \
   $(XPCOM_LIBS) \
   $(NSPR_LIBS) \
   $(NULL)
 endif
@@ -78,17 +78,17 @@ endif
 
 # This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
 # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
 NSDISTMODE = copy
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
-ifeq ($(OS_TARGET),Android)
+ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 FINAL_TARGET = $(DIST)/bin/lib
 endif
 
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
--- a/ipc/app/defs.mk
+++ b/ipc/app/defs.mk
@@ -29,17 +29,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-ifneq ($(OS_TARGET),Android)
+ifneq (android,$(MOZ_WIDGET_TOOLKIT))
 MOZ_CHILD_PROCESS_NAME := plugin-container$(BIN_SUFFIX)
 else
 # We want to let Android unpack the file at install time, but it only does
 # so if the file is named libsomething.so. The lib/ path is also required
 # because the unpacked file will be under the lib/ subdirectory and will
 # need to be executed from that path.
 MOZ_CHILD_PROCESS_NAME := lib/libplugin-container.so
 endif