Correctly track xpcom libraries across build components

Change-Id: I0979f5032ac84126fe237e6badd512e24d6f20f3

xpcom.mk

@@ -110,6 +110,7 @@ $(foreach lib,$(___LIBS),\
 $(foreach lib,$(filter-out $(GLOBAL_SEEN_XPCOM_STATIC_LIBRARIES),$(LOCAL_XPCOM_STATIC_LIBRARIES)),\
   $(eval $(TARGET_OUT_INTERMEDIATES)/STATIC_LIBRARIES/$(lib)_intermediates/export_includes: ; mkdir -p $$(@D) && touch $$@))
 GLOBAL_SEEN_XPCOM_STATIC_LIBRARIES += $(LOCAL_XPCOM_STATIC_LIBRARIES)
+GLOBAL_SEEN_XPCOM_STATIC_LIBRARIES := $(sort $(GLOBAL_SEEN_XPCOM_STATIC_LIBRARIES))
 
 LOCAL_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) $(LOCAL_XPCOM_STATIC_LIBRARIES)
 
@@ -126,6 +127,7 @@ $(foreach lib,$(___LIBS),\
 $(foreach lib,$(filter-out $(GLOBAL_SEEN_XPCOM_SHARED_LIBRARIES),$(LOCAL_XPCOM_SHARED_LIBRARIES)),\
   $(eval $(TARGET_OUT_INTERMEDIATES)/SHARED_LIBRARIES/$(lib)_intermediates/export_includes: ; mkdir -p $$(@D) && touch $$@))
 GLOBAL_SEEN_XPCOM_SHARED_LIBRARIES += $(LOCAL_XPCOM_SHARED_LIBRARIES)
+GLOBAL_SEEN_XPCOM_SHARED_LIBRARIES := $(sort $(GLOBAL_SEEN_XPCOM_SHARED_LIBRARIES))
 
 LOCAL_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) $(LOCAL_XPCOM_SHARED_LIBRARIES)