Commit 2bfc8e18 authored by Mike Hommey's avatar Mike Hommey
Browse files

Backout 45820730dfa7 and 860035a3c04a (bug 701371) and 8ac6f34b44ff (bug... 

Backout 45820730dfa7 and 860035a3c04a (bug 701371) and 8ac6f34b44ff (bug 709776) because of Android random oranges.

--HG--
rename : mozglue/build/Makefile.in => memory/mozutils/Makefile.in
rename : mozglue/build/dummy.cpp => memory/mozutils/dummy.cpp
rename : mozglue/build/fixcrt.py => memory/mozutils/fixcrt.py
rename : mozglue/build/mozglue.def.in => memory/mozutils/mozutils.def.in
rename : mozglue/android/APKOpen.cpp => other-licenses/android/APKOpen.cpp
rename : mozglue/android/APKOpen.h => other-licenses/android/APKOpen.h
rename : mozglue/android/nsGeckoUtils.cpp => other-licenses/android/nsGeckoUtils.cpp
parent 6b88ef2c

Makefile.in

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


ifndef LIBXUL_SDK

ifeq (android,$(MOZ_WIDGET_TOOLKIT))

tier_base_dirs += \

  other-licenses/android \

  other-licenses/skia-npapi \

  $(NULL)

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

endif



ifdef MOZ_MEMORY

tier_base_dirs += memory/jemalloc

endif

tier_base_dirs += \

  mozglue \

  memory/mozalloc \

  $(NULL)

tier_base_dirs += memory

endif



ifdef COMPILE_ENVIRONMENT

allmakefiles.sh

+2 −3
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

    mozglue/Makefile

    mozglue/build/Makefile

    memory/mozutils/Makefile

  "

  if [ "$MOZ_MEMORY" ]; then

    add_makefiles "
@@ -87,7 +87,6 @@ if [ ! "$LIBXUL_SDK" ]; then 
    add_makefiles "

      other-licenses/android/Makefile

      other-licenses/skia-npapi/Makefile

      mozglue/android/Makefile

    "

  fi

fi

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@mozglue@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@

@BINPATH@/res/drawable

@BINPATH@/res/drawable-hdpi

@BINPATH@/res/layout

b2g/installer/removed-files.in

+0 −1
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@mozglue@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@

#ifdef XP_MACOSX

@BINPATH@/XUL

#else