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

Bug 701371 - Rename mozutils to mozglue, and move it to top-level. r=khuey,a=brendan 

--HG--
rename : memory/mozutils/Makefile.in => mozglue/Makefile.in
rename : memory/mozutils/Makefile.in => mozglue/build/Makefile.in
rename : memory/mozutils/dummy.cpp => mozglue/build/dummy.cpp
rename : memory/mozutils/fixcrt.py => mozglue/build/fixcrt.py
rename : memory/mozutils/mozutils.def.in => mozglue/build/mozglue.def.in
parent 440c1ec8

Makefile.in

+16 −7
Original line number Diff line number Diff line
@@ -67,10 +67,19 @@ tier_base_dirs = \ 


ifndef LIBXUL_SDK

ifeq (android,$(MOZ_WIDGET_TOOLKIT))

tier_base_dirs += other-licenses/android other-licenses/skia-npapi

tier_base_dirs += \

  other-licenses/android \

  other-licenses/skia-npapi \

  $(NULL)

endif



tier_base_dirs += memory

ifdef MOZ_MEMORY

tier_base_dirs += memory/jemalloc

endif

tier_base_dirs += \

  mozglue \

  memory/mozalloc \

  $(NULL)

endif



ifdef COMPILE_ENVIRONMENT

allmakefiles.sh

+2 −2
Original line number Diff line number Diff line
@@ -74,9 +74,9 @@ extensions/Makefile 


if [ ! "$LIBXUL_SDK" ]; then

  add_makefiles "

    memory/Makefile

    memory/mozalloc/Makefile

    memory/mozutils/Makefile

    mozglue/Makefile

    mozglue/build/Makefile

  "

  if [ "$MOZ_MEMORY" ]; then

    add_makefiles "

b2g/installer/package-manifest.in

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
@BINPATH@/AndroidManifest.xml

@BINPATH@/resources.arsc

@BINPATH@/classes.dex

@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@

@BINPATH@/res/drawable

@BINPATH@/res/drawable-hdpi

@BINPATH@/res/layout

b2g/installer/removed-files.in

+1 −0
Original line number Diff line number Diff line 
README.txt

@DLL_PREFIX@mozutils@DLL_SUFFIX@

browser/installer/package-manifest.in

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@

#ifdef XP_MACOSX

@BINPATH@/XUL

#else