Fix parallel make issue, Gecko install needs to complete before

component build starts.

Change-Id: I5dfa5936c2ba9cd7f947929367cb98d17dbf535c

patch/all/build/xpidl.mk

@@ -79,7 +79,7 @@ XPIDL_FLAGS := -I$(XPIDL_PATH) -I$(LIBXUL_DIST)/idl
 # headers have no make dependency on Gecko and will fall over in
 # parallel make. Add the define below as a pre-req to every Gecko file and path
 # that we depend on
-DEPENDS_ON_GECKO := $(TARGET_OUT_INTERMEDIATES)/DATA/gecko_intermediates/gecko
+DEPENDS_ON_GECKO := $(TARGET_OUT)/b2g/distribution
 
 xpidl_prereqs:
 	@mkdir -p $(XPIDL_OUT)
@@ -171,9 +171,9 @@ install_js_srcs: xpidl_install_prereqs
 endif
 
 xpcom_install: xpidl_install_prereqs create_install_rdf create_chrome_manifest install_js_srcs $(GECKO_DIR)/config/buildlist.py
-	cp $(XPIDL_OUT)/install.rdf $(XPCOM_INSTALL_DIR)
-	cp $(XPIDL_OUT)/chrome.manifest $(XPCOM_INSTALL_DIR)
-	-cp $(XPIDL_PATH)/bootstrap.js $(XPCOM_INSTALL_DIR)
+	@cp $(XPIDL_OUT)/install.rdf $(XPCOM_INSTALL_DIR)
+	@cp $(XPIDL_OUT)/chrome.manifest $(XPCOM_INSTALL_DIR)
+	-@cp $(XPIDL_PATH)/bootstrap.js $(XPCOM_INSTALL_DIR)
 	@$(PYTHON) $(GECKO_DIR)/config/buildlist.py $(XPCOM_INSTALL_DIR)/components/interfaces.manifest "interfaces $(XPIDL_MODULE).xpt"
 	@$(PYTHON) $(GECKO_DIR)/config/buildlist.py $(XPCOM_INSTALL_DIR)/chrome.manifest "manifest components/interfaces.manifest"
 	@$(PYTHON) $(GECKO_DIR)/config/buildlist.py $(XPCOM_INSTALL_DIR)/chrome.manifest "manifest components/$(XPIDL_MODULE).manifest"

patch/all/gonk-misc/gonk-add-xpcom-libs.patch

 diff --git a/Android.mk b/Android.mk
-index 4e67e5a..ded4ac8 100644
+index f610810..6565390 100644
 --- a/Android.mk
 +++ b/Android.mk
-@@ -126,6 +126,13 @@ GECKO_LIB_DEPS := \
+@@ -90,6 +90,8 @@ LOCAL_MODULE_TAGS := optional eng
+ LOCAL_MODULE_PATH := $(TARGET_OUT)
+ include $(BUILD_PREBUILT)
+ 
++$(TARGET_OUT)/b2g/distribution: $(LOCAL_INSTALLED_MODULE)
++
+ $(LOCAL_INSTALLED_MODULE):
+ 	@echo Install dir: $(TARGET_OUT)/b2g
+ 	rm -rf $(TARGET_OUT)/b2g
+@@ -117,6 +119,13 @@ GECKO_LIB_DEPS := \
  	libsensorservice.so \
  	libsysutils.so \
  
@@ -16,7 +25,7 @@ index 4e67e5a..ded4ac8 100644
  .PHONY: $(LOCAL_BUILT_MODULE)
  $(LOCAL_BUILT_MODULE): $(TARGET_CRTBEGIN_DYNAMIC_O) $(TARGET_CRTEND_O) $(addprefix $(TARGET_OUT_SHARED_LIBRARIES)/,$(GECKO_LIB_DEPS))
  	export CONFIGURE_ARGS="$(GECKO_CONFIGURE_ARGS)" && \
-@@ -143,4 +150,13 @@ $(LOCAL_BUILT_MODULE): $(TARGET_CRTBEGIN_DYNAMIC_O) $(TARGET_CRTEND_O) $(addpref
+@@ -134,4 +143,13 @@ $(LOCAL_BUILT_MODULE): $(TARGET_CRTBEGIN_DYNAMIC_O) $(TARGET_CRTEND_O) $(addpref
  	$(MAKE) -C $(GECKO_PATH) -f client.mk -s && \
  	rm -f $(GECKO_OBJDIR)/dist/b2g-*.tar.gz && \
  	$(MAKE) -C $(GECKO_OBJDIR) package && \