xpcom.mk: Install modules in bundles/ rather than extensions/

Change-Id: I3e79bc91122aec969f5fe5016c8e12687c8fbc19

.config

@@ -31,10 +31,10 @@ export GAIA_DOMAIN
 __flash_device()
 {
 	if [ "$1" = "ext" ]; then
+		run_adb root
 		run_adb remount
-		run_adb shell rm -r /system/b2g/distribution/extensions
-		run_adb push out/target/product/$DEVICE/system/b2g/distribution/extensions /system/b2g/distribution/extensions
-		run_adb shell rm -r /data/b2g
+		run_adb shell rm -r /system/b2g/distribution/
+		run_adb push out/target/product/$DEVICE/system/b2g/distribution/ /system/b2g/distribution/
 		return
 	fi
 

patch/all/build/clear_xpcom_vars.mk

@@ -3,7 +3,6 @@ include $(CLEAR_VARS)
 LOCAL_XPCOM_IDLS :=
 LOCAL_XPCOM_STATIC_LIBRARIES :=
 LOCAL_XPCOM_SHARED_LIBRARIES :=
-LOCAL_XPCOM_MODULE_UUID :=
 LOCAL_XPCOM_MODULE :=
 LOCAL_XPIDL_PATH :=
 LOCAL_XPCOM_MODULE_OBJDIR :=
@@ -11,4 +10,3 @@ LOCAL_XPIDL_OUT :=
 LOCAL_XPIDL_FLAGS :=
 LOCAL_XPCOM_INSTALL_DIR :=
 LOCAL_JS_SRC_FILES :=
-LOCAL_XPCOM_MODULE_SUFFIX :=

patch/all/build/xpcom.mk

@@ -32,11 +32,6 @@ LOCAL_XPCOM_MODULE_OBJDIR := $(TARGET_OUT_INTERMEDIATES)/SHARED_LIBRARIES/$(LOCA
 # The directory where all the objs generated by idl compilation will go
 LOCAL_XPIDL_OUT := $(LOCAL_XPCOM_MODULE_OBJDIR)/xpidl_obj
 
-# Do sanity checks on makefile and directory content
-ifeq (,$(strip $(LOCAL_XPCOM_MODULE_UUID)))
-$(error LOCAL_XPCOM_MODULE_UUID must be defined)
-endif
-
 # Add Gecko as a dependency of this module.
 LOCAL_REQUIRED_MODULES := $(LOCAL_REQUIRED_MODULES) gecko
 # Add Gecko headers to include path
@@ -146,7 +141,7 @@ endif
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_XPCOM_MODULE)-xpcom_install
 
-LOCAL_XPCOM_INSTALL_DIR := $(TARGET_OUT)/b2g/distribution/extensions/$(LOCAL_XPCOM_MODULE_UUID)
+LOCAL_XPCOM_INSTALL_DIR := $(TARGET_OUT)/b2g/distribution/bundles/$(LOCAL_XPCOM_MODULE)
 
 $(LOCAL_XPCOM_MODULE)-xpidl_install_prereqs: PRIVATE_XPCOM_INSTALL_DIR := $(LOCAL_XPCOM_INSTALL_DIR)
 $(LOCAL_XPCOM_MODULE)-xpidl_install_prereqs: $(DEPENDS_ON_GECKO)
@@ -208,10 +203,8 @@ endif
 $(LOCAL_XPCOM_MODULE)-xpcom_install: PRIVATE_XPIDL_PATH := $(LOCAL_XPIDL_PATH)
 $(LOCAL_XPCOM_MODULE)-xpcom_install: PRIVATE_XPCOM_INSTALL_DIR := $(LOCAL_XPCOM_INSTALL_DIR)
 $(LOCAL_XPCOM_MODULE)-xpcom_install: PRIVATE_XPCOM_MODULE := $(LOCAL_XPCOM_MODULE)
-$(LOCAL_XPCOM_MODULE)-xpcom_install: $(LOCAL_XPCOM_MODULE)-xpidl_install_prereqs $(LOCAL_XPCOM_MODULE)-install_js_srcs $(GECKO_DIR)/config/buildlist.py $(LOCAL_XPIDL_PATH)/install.rdf $(LOCAL_XPIDL_PATH)/chrome.manifest
-	@cp $(PRIVATE_XPIDL_PATH)/install.rdf $(PRIVATE_XPCOM_INSTALL_DIR)
+$(LOCAL_XPCOM_MODULE)-xpcom_install: $(LOCAL_XPCOM_MODULE)-xpidl_install_prereqs $(LOCAL_XPCOM_MODULE)-install_js_srcs $(GECKO_DIR)/config/buildlist.py $(LOCAL_XPIDL_PATH)/chrome.manifest
 	@cp $(PRIVATE_XPIDL_PATH)/chrome.manifest $(PRIVATE_XPCOM_INSTALL_DIR)
-	@test -f $(PRIVATE_XPIDL_PATH)/bootstrap.js && cp $(PRIVATE_XPIDL_PATH)/bootstrap.js $(PRIVATE_XPCOM_INSTALL_DIR) || true
 ifneq (,$(strip $(LOCAL_XPCOM_IDLS)))
 	$(PYTHON) $(GECKO_DIR)/config/buildlist.py $(PRIVATE_XPCOM_INSTALL_DIR)/interfaces.manifest "interfaces $(PRIVATE_XPCOM_MODULE).xpt"
 	$(PYTHON) $(GECKO_DIR)/config/buildlist.py $(PRIVATE_XPCOM_INSTALL_DIR)/chrome.manifest "manifest interfaces.manifest"