Merge "xpcom.mk: Strip DSOs"

patch/all/build/xpcom.mk

@@ -170,11 +170,15 @@ include $(BUILD_SHARED_LIBRARY)
 
 # Install the .so only if its not a pure JS component
 ifneq (,$(strip $(LOCAL_SRC_FILES)))
-$(LOCAL_INSTALLED_MODULE): PRIVATE_XPCOM_MODULE := $(LOCAL_XPCOM_MODULE)
-$(LOCAL_INSTALLED_MODULE): PRIVATE_XPCOM_INSTALL_DIR := $(LOCAL_XPCOM_INSTALL_DIR)
-$(LOCAL_INSTALLED_MODULE): PRIVATE_XPCOM_MODULE_OBJDIR := $(LOCAL_XPCOM_MODULE_OBJDIR)
+$(LOCAL_INSTALLED_MODULE): $(LOCAL_XPCOM_INSTALL_DIR)/$(LOCAL_XPCOM_MODULE).so
+$(LOCAL_XPCOM_INSTALL_DIR)/$(LOCAL_XPCOM_MODULE).so : \
+  $(LOCAL_XPCOM_MODULE_OBJDIR)/LINKED/$(LOCAL_XPCOM_MODULE).so | $(TARGET_STRIP)
+	$(transform-to-stripped)
+
+# Override the install rule supplied by BUILD_SHARED_LIBRARY
+# TODO: This could be done in a cleaner fashion...
 $(LOCAL_INSTALLED_MODULE):
-	cp $(PRIVATE_XPCOM_MODULE_OBJDIR)/LINKED/$(PRIVATE_XPCOM_MODULE).so $(PRIVATE_XPCOM_INSTALL_DIR)
+	$(hide) true
 endif
 
 $(LOCAL_XPCOM_MODULE)-export_idls: PRIVATE_XPCOM_INSTALL_DIR := $(LIBXUL_DIST)/idl