wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 686464 - Leave it to Android to unpack the content process executable. r=ted

Browse Source
This commit is contained in:
Mike Hommey 2011-10-27 14:53:20 +02:00
parent e9ae370ccc
commit c04dec79a7
6 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/rules.mk
View File

@ -1636,9 +1636,9 @@ chrome::
$(FINAL_TARGET)/chrome:
$(NSINSTALL) -D $@
libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
ifneq (,$(wildcard $(JAR_MANIFEST)))
ifndef NO_DIST_INSTALL
libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
$(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
$(QUIET) -j $(FINAL_TARGET)/chrome \
$(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \

1
embedding/android/GeckoApp.java
View File

@ -602,7 +602,6 @@ abstract public class GeckoApp
Log.w(LOG_FILE_NAME, "error removing files", ex);
}
unpackFile(zip, buf, null, "application.ini");
unpackFile(zip, buf, null, getContentProcessName());
try {
unpackFile(zip, buf, null, "update.locale");
} catch (Exception e) {/* this is non-fatal */}

11
ipc/app/Makefile.in
View File

@ -47,6 +47,13 @@ MODULE = ipc
include $(topsrcdir)/ipc/app/defs.mk
PROGRAM = $(MOZ_CHILD_PROCESS_NAME)
$(PROGRAM): $(dir $(PROGRAM))
$(dir $(PROGRAM)):
mkdir $@
GARBAGE_DIRS += $(dir $(PROGRAM))
CPPSRCS = \
MozillaRuntimeMain.cpp \
$(NULL)
@ -79,6 +86,10 @@ NSDISTMODE = copy
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifeq ($(OS_TARGET),Android)
FINAL_TARGET = $(DIST)/bin/lib
endif
ifdef _MSC_VER
# Always enter a Windows program through wmain, whether or not we're
# a console application.

8
ipc/app/defs.mk
View File

@ -34,5 +34,13 @@
#
# ***** END LICENSE BLOCK *****
ifneq ($(OS_TARGET),Android)
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
MOZ_CHILD_PROCESS_BUNDLE := plugin-container.app/Contents/MacOS/

2
js/src/config/rules.mk
View File

@ -1636,9 +1636,9 @@ chrome::
$(FINAL_TARGET)/chrome:
$(NSINSTALL) -D $@
libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
ifneq (,$(wildcard $(JAR_MANIFEST)))
ifndef NO_DIST_INSTALL
libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
$(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
$(QUIET) -j $(FINAL_TARGET)/chrome \
$(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \

3
toolkit/mozapps/installer/packager.mk
View File

@ -324,9 +324,8 @@ INNER_MAKE_PACKAGE = \
make -C ../embedding/android gecko.ap_ && \
cp ../embedding/android/gecko.ap_ $(_ABS_DIST) && \
( cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && \
rm -rf lib && \
mkdir -p lib/$(ABI_DIR) && \
mv libmozutils.so lib/$(ABI_DIR) && \
mv libmozutils.so $(MOZ_CHILD_PROCESS_NAME) lib/$(ABI_DIR) && \
rm -f lib.id && \
for SOMELIB in *.so ; \
do \