Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Prelink libraries while installing.
Browse files Browse the repository at this point in the history
  • Loading branch information
ting-yuan committed Jan 10, 2013
1 parent 4ecded7 commit e23e7ce
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
21 changes: 20 additions & 1 deletion Android.mk
Expand Up @@ -149,7 +149,17 @@ ifeq ($(B2G_SYSTEM_APPS),1)
PRESERVE_B2G_WEBAPPS := 1 PRESERVE_B2G_WEBAPPS := 1
endif endif


$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) gaia/profile.tar.gz ifeq ($(ENABLE_GLOBAL_PRELINK),1)
APRIORI := $(HOST_OUT_EXECUTABLES)/apriori$(HOST_EXECUTABLE_SUFFIX)
PRELINK_MAP := $(abspath $(LOCAL_PATH)/prelink.map)
ifeq ($(MOZ_DMD),1)
PRELOAD_LIBS := -Dlibmozglue.so -Dlibdmd.so
else
PRELOAD_LIBS := -Dlibmozglue.so
endif
endif

$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) gaia/profile.tar.gz $(APRIORI) $(PRELINK_MAP)
@echo Install dir: $(TARGET_OUT)/b2g @echo Install dir: $(TARGET_OUT)/b2g


ifeq ($(PRESERVE_B2G_WEBAPPS), 1) ifeq ($(PRESERVE_B2G_WEBAPPS), 1)
Expand All @@ -170,6 +180,15 @@ endif


cd $(TARGET_OUT) && tar xvfz $(abspath $<) cd $(TARGET_OUT) && tar xvfz $(abspath $<)


ifeq ($(ENABLE_GLOBAL_PRELINK),1)
$(APRIORI) \
$(PRELOAD_LIBS) \
-L$(TARGET_OUT_SHARED_LIBRARIES) \
-L$(TARGET_OUT)/b2g \
-p $(PRELINK_MAP) \
`find $(TARGET_OUT)/b2g -name "lib*.so"`
endif

# Target to create Gecko update package (MAR) # Target to create Gecko update package (MAR)
DIST_B2G_UPDATE_DIR := $(GECKO_OBJDIR)/dist/b2g-update DIST_B2G_UPDATE_DIR := $(GECKO_OBJDIR)/dist/b2g-update
UPDATE_PACKAGE_TARGET := $(DIST_B2G_UPDATE_DIR)/b2g-gecko-update.mar UPDATE_PACKAGE_TARGET := $(DIST_B2G_UPDATE_DIR)/b2g-gecko-update.mar
Expand Down
5 changes: 5 additions & 0 deletions default-gecko-config
Expand Up @@ -60,3 +60,8 @@ ac_add_options --disable-ion
if [ "${MOZ_DMD:-0}" != 0 ]; then if [ "${MOZ_DMD:-0}" != 0 ]; then
ac_add_options --enable-dmd ac_add_options --enable-dmd
fi fi

if [ "${ENABLE_GLOBAL_PRELINK:-0}" != 0 ]; then
# Disable ELF_HACK on B2G for prelink.
ac_add_options --disable-elf-hack
fi

0 comments on commit e23e7ce

Please sign in to comment.