Skip to content
Snippets Groups Projects
Commit 892ea076 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Fix incorrect local_path when building idl files"

parents 237f42c6 6dc64d2f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 2 deletions
xpcom.mk
+ 4
− 2
View file @ 892ea076
......@@ -145,15 +145,17 @@ LOCAL_ADDITIONAL_INSTALL_DEPENDENCIES += $(patsubst %.idl,$(LOCAL_XPIDL_OUT)/%.x
LOCAL_ADDITIONAL_INSTALL_DEPENDENCIES += $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE).xpt
endif
$(LOCAL_XPIDL_OUT)/%.h: PRIVATE_LOCAL_XPIDL_FLAGS := $(LOCAL_XPIDL_FLAGS)
$(LOCAL_XPIDL_OUT)/%.h: $(LOCAL_PATH)/%.idl $(XPIDL_DEPS)
@mkdir -p $(@D)
$(REPORT_BUILD)
$(XPCOM_PYTHON) $(PLY_INCLUDE) $(LIBXUL_DIST)/sdk/bin/header.py $(LOCAL_XPIDL_FLAGS) $(CURRENT_IDLS) -o $@
$(XPCOM_PYTHON) $(PLY_INCLUDE) $(LIBXUL_DIST)/sdk/bin/header.py $(PRIVATE_LOCAL_XPIDL_FLAGS) $(CURRENT_IDLS) -o $@
$(LOCAL_XPIDL_OUT)/%.xpt: PRIVATE_LOCAL_XPIDL_FLAGS := $(LOCAL_XPIDL_FLAGS)
$(LOCAL_XPIDL_OUT)/%.xpt: $(LOCAL_PATH)/%.idl $(XPIDL_DEPS)
@mkdir -p $(@D)
$(REPORT_BUILD)
$(XPCOM_PYTHON) $(PLY_INCLUDE) -I$(GECKO_DIR)/xpcom/typelib/xpt/tools $(LIBXUL_DIST)/sdk/bin/typelib.py $(LOCAL_XPIDL_FLAGS) $(CURRENT_IDLS) -o $@
$(XPCOM_PYTHON) $(PLY_INCLUDE) -I$(GECKO_DIR)/xpcom/typelib/xpt/tools $(LIBXUL_DIST)/sdk/bin/typelib.py $(PRIVATE_LOCAL_XPIDL_FLAGS) $(CURRENT_IDLS) -o $@
$(LOCAL_XPIDL_OUT)/$(LOCAL_MODULE).xpt: $(patsubst %.idl,$(LOCAL_XPIDL_OUT)/%.xpt,$(LOCAL_XPCOM_IDLS)) $(DEPENDS_ON_GECKO)
$(XPIDL_LINK) $@ $(filter-out $(DEPENDS_ON_GECKO), $^)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment