Commit b32a4ed1 authored by Mike Hommey's avatar Mike Hommey
Browse files

Backout changeset 3fd4b546eed4 (bug 874266) and changeset a35d2e3a872f (bug... 

Backout changeset 3fd4b546eed4 (bug 874266) and changeset a35d2e3a872f (bug 942043) for ASAN build bustage and Windows test bustage

--HG--
extra : amend_source : f20d09aeff1c8b5cbd0f1d24c7ce04e86f3aed1d
parent 37838abf

accessible/public/ia2/Makefile.in

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ DEFFILE = $(win_srcdir)/IA2Marshal.def 


IA2DIR        = $(topsrcdir)/other-licenses/ia2



DEFINES       += -DREGISTER_PROXY_DLL



GARBAGE       += $(MIDL_GENERATED_FILES)



# Please keep this list in sync with the moz.build file until the rest of this

accessible/public/ia2/moz.build

+0 −2
Original line number Diff line number Diff line
@@ -7,5 +7,3 @@ 
LIBRARY_NAME = 'IA2Marshal'



FORCE_SHARED_LIB = True
 


DEFINES['REGISTER_PROXY_DLL'] = True

accessible/public/msaa/Makefile.in

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


DEFFILE = $(win_srcdir)/AccessibleMarshal.def



DEFINES += -DREGISTER_PROXY_DLL



GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c



MIDL_GENERATED_FILES = \

accessible/public/msaa/moz.build

+0 −2
Original line number Diff line number Diff line
@@ -17,5 +17,3 @@ GENERATED_SOURCES += [ 
]



FORCE_SHARED_LIB = True
 


DEFINES['REGISTER_PROXY_DLL'] = True

b2g/app/Makefile.in

+11 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ include $(topsrcdir)/config/makefiles/rcs.mk 


PREF_JS_EXPORTS = $(srcdir)/b2g.js



ifdef ENABLE_MARIONETTE

DEFINES += -DENABLE_MARIONETTE=1

endif



ifndef LIBXUL_SDK



ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
@@ -35,6 +39,7 @@ LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base 
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build

LOCAL_INCLUDES += -I$(DEPTH)/build



DEFINES += -DXPCOM_GLUE

STL_FLAGS=



LIBS += $(JEMALLOC_LIBS)
@@ -78,6 +83,12 @@ include $(topsrcdir)/config/rules.mk 


APP_ICON = b2g



DEFINES += \

  -DAPP_NAME=$(MOZ_APP_NAME) \

  -DAPP_VERSION=$(MOZ_APP_VERSION) \

  -DMOZ_UPDATER=$(MOZ_UPDATER) \

  $(NULL)



source_repo ?= $(call getSourceRepo,$(srcdir)/..)

ifneq (,$(filter http%,$(source_repo)))

  DEFINES += -DMOZ_SOURCE_REPO="$(source_repo)"