--- a/embedding/Makefile.in
+++ b/embedding/Makefile.in
@@ -48,13 +48,9 @@ MODULE       = embed
 
 DIRS = base components browser
 
 ifdef ENABLE_TESTS
 XPCSHELL_TESTS = tests/unit
 DIRS += test
 endif
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-DIRS += android
-endif
-
 include $(topsrcdir)/config/rules.mk

--- a/mobile/android/Makefile.in
+++ b/mobile/android/Makefile.in
@@ -38,17 +38,17 @@
 
 DEPTH      = ../..
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = chrome locales components modules themes/core app
+DIRS = base chrome locales components modules themes/core app
 
 ifndef LIBXUL_SDK
 PARALLEL_DIRS += $(DEPTH)/xulrunner/tools/redit
 endif
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/testing/testsuite-targets.mk
 

copy from embedding/android/AlertNotification.java
copy to mobile/android/base/AlertNotification.java

copy from embedding/android/AndroidManifest.xml.in
copy to mobile/android/base/AndroidManifest.xml.in

copy from embedding/android/App.java.in
copy to mobile/android/base/App.java.in

copy from embedding/android/AwesomeBar.java
copy to mobile/android/base/AwesomeBar.java

copy from embedding/android/AwesomeBarTabs.java
copy to mobile/android/base/AwesomeBarTabs.java

copy from embedding/android/BrowserToolbar.java
copy to mobile/android/base/BrowserToolbar.java

copy from embedding/android/ConfirmPreference.java
copy to mobile/android/base/ConfirmPreference.java

copy from embedding/android/CrashReporter.java.in
copy to mobile/android/base/CrashReporter.java.in

copy from embedding/android/DoorHanger.java
copy to mobile/android/base/DoorHanger.java

copy from embedding/android/DoorHangerPopup.java
copy to mobile/android/base/DoorHangerPopup.java

copy from embedding/android/Favicons.java
copy to mobile/android/base/Favicons.java

copy from embedding/android/GeckoApp.java
copy to mobile/android/base/GeckoApp.java

copy from embedding/android/GeckoAppShell.java
copy to mobile/android/base/GeckoAppShell.java

copy from embedding/android/GeckoAsyncTask.java
copy to mobile/android/base/GeckoAsyncTask.java

copy from embedding/android/GeckoBatteryManager.java
copy to mobile/android/base/GeckoBatteryManager.java

copy from embedding/android/GeckoConnectivityReceiver.java
copy to mobile/android/base/GeckoConnectivityReceiver.java

copy from embedding/android/GeckoEvent.java
copy to mobile/android/base/GeckoEvent.java

copy from embedding/android/GeckoEventListener.java
copy to mobile/android/base/GeckoEventListener.java

copy from embedding/android/GeckoInputConnection.java
copy to mobile/android/base/GeckoInputConnection.java

copy from embedding/android/GeckoPreferences.java
copy to mobile/android/base/GeckoPreferences.java

copy from embedding/android/GeckoStateListDrawable.java
copy to mobile/android/base/GeckoStateListDrawable.java

copy from embedding/android/GeckoThread.java
copy to mobile/android/base/GeckoThread.java

copy from embedding/android/GlobalHistory.java
copy to mobile/android/base/GlobalHistory.java

copy from embedding/android/LauncherShortcuts.java.in
copy to mobile/android/base/LauncherShortcuts.java.in

copy from embedding/android/Makefile.in
copy to mobile/android/base/Makefile.in
--- a/embedding/android/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -30,17 +30,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/ipc/app/defs.mk
 
 DIRS = locales
@@ -304,60 +304,60 @@ JAVA_CLASSPATH = $(ANDROID_SDK)/android.
 
 DEFAULT_BRANDPATH = $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/en-US/brand.dtd
 DEFAULT_STRINGSPATH = locales/en-US/android_strings.dtd
 LOCALIZED_BRANDPATH = $(DEPTH)/dist/bin/chrome/$(AB_CD)/locale/branding/brand.dtd
 LOCALIZED_STRINGSPATH = $(DEPTH)/dist/bin/chrome/android-res/res/values-$(AB_CD)/android_strings.dtd
 
 ifdef MOZ_CRASHREPORTER
 PROCESSEDJAVAFILES += CrashReporter.java
-MOZ_ANDROID_DRAWABLES += embedding/android/resources/drawable/crash_reporter.png
+MOZ_ANDROID_DRAWABLES += mobile/android/base/resources/drawable/crash_reporter.png
 RES_LAYOUT += res/layout/crash_reporter.xml
 endif
 
-MOZ_ANDROID_DRAWABLES += embedding/android/resources/drawable/address_bar_bg.xml              \
-                         embedding/android/resources/drawable/address_bar_url_default.xml     \
-                         embedding/android/resources/drawable/address_bar_url_pressed.xml     \
-                         embedding/android/resources/drawable/awesomebar_tab_focus.xml        \
-                         embedding/android/resources/drawable/awesomebar_tab_focus_selected.xml \
-                         embedding/android/resources/drawable/awesomebar_tab_indicator.xml    \
-                         embedding/android/resources/drawable/awesomebar_tab_press.xml        \
-                         embedding/android/resources/drawable/awesomebar_tab_press_selected.xml \
-                         embedding/android/resources/drawable/awesomebar_tab_selected.xml     \
-                         embedding/android/resources/drawable/awesomebar_tab_unselected.xml   \
-                         embedding/android/resources/drawable/desktop_notification.png        \
-                         embedding/android/resources/drawable/favicon.png                     \
-                         embedding/android/resources/drawable/progress_spinner.xml            \
-                         embedding/android/resources/drawable/progress_spinner_1.png          \
-                         embedding/android/resources/drawable/progress_spinner_2.png          \
-                         embedding/android/resources/drawable/progress_spinner_3.png          \
-                         embedding/android/resources/drawable/progress_spinner_4.png          \
-                         embedding/android/resources/drawable/progress_spinner_5.png          \
-                         embedding/android/resources/drawable/progress_spinner_6.png          \
-                         embedding/android/resources/drawable/progress_spinner_7.png          \
-                         embedding/android/resources/drawable/progress_spinner_8.png          \
-                         embedding/android/resources/drawable/progress_spinner_9.png          \
-                         embedding/android/resources/drawable/progress_spinner_10.png         \
-                         embedding/android/resources/drawable/progress_spinner_11.png         \
-                         embedding/android/resources/drawable/progress_spinner_12.png         \
-                         embedding/android/resources/drawable/progress_spinner_13.png         \
-                         embedding/android/resources/drawable/progress_spinner_14.png         \
-                         embedding/android/resources/drawable/progress_spinner_15.png         \
-                         embedding/android/resources/drawable/progress_spinner_16.png         \
-                         embedding/android/resources/drawable/progress_spinner_17.png         \
-                         embedding/android/resources/drawable/progress_spinner_18.png         \
-                         embedding/android/resources/drawable/start.png                       \
-                         embedding/android/resources/drawable/site_security_level.xml         \
-                         embedding/android/resources/drawable/tab_new.png                     \
-                         embedding/android/resources/drawable/tab_close.png                   \
-                         embedding/android/resources/drawable/tabs_button.xml                 \
-                         embedding/android/resources/drawable/tabs_level.xml                  \
-                         embedding/android/resources/drawable/tabs_tray_bg.9.png              \
-                         embedding/android/resources/drawable/checkerboard.png                \
-                         embedding/android/resources/drawable/shadow.png                      \
+MOZ_ANDROID_DRAWABLES += mobile/android/base/resources/drawable/address_bar_bg.xml              \
+                         mobile/android/base/resources/drawable/address_bar_url_default.xml     \
+                         mobile/android/base/resources/drawable/address_bar_url_pressed.xml     \
+                         mobile/android/base/resources/drawable/awesomebar_tab_focus.xml        \
+                         mobile/android/base/resources/drawable/awesomebar_tab_focus_selected.xml \
+                         mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml    \
+                         mobile/android/base/resources/drawable/awesomebar_tab_press.xml        \
+                         mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml \
+                         mobile/android/base/resources/drawable/awesomebar_tab_selected.xml     \
+                         mobile/android/base/resources/drawable/awesomebar_tab_unselected.xml   \
+                         mobile/android/base/resources/drawable/desktop_notification.png        \
+                         mobile/android/base/resources/drawable/favicon.png                     \
+                         mobile/android/base/resources/drawable/progress_spinner.xml            \
+                         mobile/android/base/resources/drawable/progress_spinner_1.png          \
+                         mobile/android/base/resources/drawable/progress_spinner_2.png          \
+                         mobile/android/base/resources/drawable/progress_spinner_3.png          \
+                         mobile/android/base/resources/drawable/progress_spinner_4.png          \
+                         mobile/android/base/resources/drawable/progress_spinner_5.png          \
+                         mobile/android/base/resources/drawable/progress_spinner_6.png          \
+                         mobile/android/base/resources/drawable/progress_spinner_7.png          \
+                         mobile/android/base/resources/drawable/progress_spinner_8.png          \
+                         mobile/android/base/resources/drawable/progress_spinner_9.png          \
+                         mobile/android/base/resources/drawable/progress_spinner_10.png         \
+                         mobile/android/base/resources/drawable/progress_spinner_11.png         \
+                         mobile/android/base/resources/drawable/progress_spinner_12.png         \
+                         mobile/android/base/resources/drawable/progress_spinner_13.png         \
+                         mobile/android/base/resources/drawable/progress_spinner_14.png         \
+                         mobile/android/base/resources/drawable/progress_spinner_15.png         \
+                         mobile/android/base/resources/drawable/progress_spinner_16.png         \
+                         mobile/android/base/resources/drawable/progress_spinner_17.png         \
+                         mobile/android/base/resources/drawable/progress_spinner_18.png         \
+                         mobile/android/base/resources/drawable/start.png                       \
+                         mobile/android/base/resources/drawable/site_security_level.xml         \
+                         mobile/android/base/resources/drawable/tab_new.png                     \
+                         mobile/android/base/resources/drawable/tab_close.png                   \
+                         mobile/android/base/resources/drawable/tabs_button.xml                 \
+                         mobile/android/base/resources/drawable/tabs_level.xml                  \
+                         mobile/android/base/resources/drawable/tabs_tray_bg.9.png              \
+                         mobile/android/base/resources/drawable/checkerboard.png                \
+                         mobile/android/base/resources/drawable/shadow.png                      \
                          $(NULL)
 
 
 MOZ_ANDROID_DRAWABLES += $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn | tr '\n' ' ';  fi)
 
 include $(topsrcdir)/config/rules.mk
 
 ifneq ($(AB_CD),en-US)

copy from embedding/android/NotificationHandler.java.in
copy to mobile/android/base/NotificationHandler.java.in

copy from embedding/android/PromptService.java
copy to mobile/android/base/PromptService.java

copy from embedding/android/Restarter.java.in
copy to mobile/android/base/Restarter.java.in

copy from embedding/android/SurfaceLockInfo.java
copy to mobile/android/base/SurfaceLockInfo.java

copy from embedding/android/Tab.java
copy to mobile/android/base/Tab.java

copy from embedding/android/Tabs.java
copy to mobile/android/base/Tabs.java

copy from embedding/android/TabsTray.java
copy to mobile/android/base/TabsTray.java

copy from embedding/android/gfx/BufferedCairoImage.java
copy to mobile/android/base/gfx/BufferedCairoImage.java

copy from embedding/android/gfx/CairoImage.java
copy to mobile/android/base/gfx/CairoImage.java

copy from embedding/android/gfx/CairoUtils.java
copy to mobile/android/base/gfx/CairoUtils.java

copy from embedding/android/gfx/GeckoSoftwareLayerClient.java
copy to mobile/android/base/gfx/GeckoSoftwareLayerClient.java

copy from embedding/android/gfx/InputConnectionHandler.java
copy to mobile/android/base/gfx/InputConnectionHandler.java

copy from embedding/android/gfx/IntSize.java
copy to mobile/android/base/gfx/IntSize.java

copy from embedding/android/gfx/Layer.java
copy to mobile/android/base/gfx/Layer.java

copy from embedding/android/gfx/LayerClient.java
copy to mobile/android/base/gfx/LayerClient.java

copy from embedding/android/gfx/LayerController.java
copy to mobile/android/base/gfx/LayerController.java

copy from embedding/android/gfx/LayerRenderer.java
copy to mobile/android/base/gfx/LayerRenderer.java

copy from embedding/android/gfx/LayerView.java
copy to mobile/android/base/gfx/LayerView.java

copy from embedding/android/gfx/NinePatchTileLayer.java
copy to mobile/android/base/gfx/NinePatchTileLayer.java

copy from embedding/android/gfx/PlaceholderLayerClient.java
copy to mobile/android/base/gfx/PlaceholderLayerClient.java

copy from embedding/android/gfx/PointUtils.java
copy to mobile/android/base/gfx/PointUtils.java

copy from embedding/android/gfx/RectUtils.java
copy to mobile/android/base/gfx/RectUtils.java

copy from embedding/android/gfx/SingleTileLayer.java
copy to mobile/android/base/gfx/SingleTileLayer.java

copy from embedding/android/gfx/TextLayer.java
copy to mobile/android/base/gfx/TextLayer.java

copy from embedding/android/gfx/TextureReaper.java
copy to mobile/android/base/gfx/TextureReaper.java

copy from embedding/android/gfx/TileLayer.java
copy to mobile/android/base/gfx/TileLayer.java

copy from embedding/android/locales/Makefile.in
copy to mobile/android/base/locales/Makefile.in
--- a/embedding/android/locales/Makefile.in
+++ b/mobile/android/base/locales/Makefile.in
@@ -30,19 +30,19 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH     = ../../..
+DEPTH     = ../../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir = embedding/android/locales
+relativesrcdir = mobile/android/base/locales
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk

copy from embedding/android/locales/en-US/android_strings.dtd
copy to mobile/android/base/locales/en-US/android_strings.dtd

copy from embedding/android/locales/jar.mn
copy to mobile/android/base/locales/jar.mn

copy from embedding/android/locales/l10n.ini
copy to mobile/android/base/locales/l10n.ini
--- a/embedding/android/locales/l10n.ini
+++ b/mobile/android/base/locales/l10n.ini
@@ -1,5 +1,5 @@
 [general]
 depth = ../../..
 
 [compare]
-dirs = embedding/android
+dirs = mobile/android/base

copy from embedding/android/package-name.txt.in
copy to mobile/android/base/package-name.txt.in

copy from embedding/android/resources/anim/grow_fade_in.xml
copy to mobile/android/base/resources/anim/grow_fade_in.xml

copy from embedding/android/resources/anim/shrink_fade_out.xml
copy to mobile/android/base/resources/anim/shrink_fade_out.xml

copy from embedding/android/resources/color/awesomebar_tab_text.xml
copy to mobile/android/base/resources/color/awesomebar_tab_text.xml

copy from embedding/android/resources/drawable-hdpi-v11/address_bar_url_bg.9.png
copy to mobile/android/base/resources/drawable-hdpi-v11/address_bar_url_bg.9.png

copy from embedding/android/resources/drawable-hdpi-v11/ic_menu_bookmark_add.png
copy to mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_add.png

copy from embedding/android/resources/drawable-hdpi-v11/ic_menu_bookmark_remove.png
copy to mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_remove.png

copy from embedding/android/resources/drawable-hdpi-v11/ic_menu_find_in_page.png
copy to mobile/android/base/resources/drawable-hdpi-v11/ic_menu_find_in_page.png

copy from embedding/android/resources/drawable-hdpi-v11/ic_menu_forward.png
copy to mobile/android/base/resources/drawable-hdpi-v11/ic_menu_forward.png

copy from embedding/android/resources/drawable-hdpi-v11/ic_menu_reload.png
copy to mobile/android/base/resources/drawable-hdpi-v11/ic_menu_reload.png

copy from embedding/android/resources/drawable-hdpi-v11/ic_menu_save_as_pdf.png
copy to mobile/android/base/resources/drawable-hdpi-v11/ic_menu_save_as_pdf.png

copy from embedding/android/resources/drawable-hdpi-v11/ic_menu_share.png
copy to mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png

copy from embedding/android/resources/drawable-hdpi-v11/tabs_more.png
copy to mobile/android/base/resources/drawable-hdpi-v11/tabs_more.png

copy from embedding/android/resources/drawable-hdpi-v11/tabs_normal.png
copy to mobile/android/base/resources/drawable-hdpi-v11/tabs_normal.png

copy from embedding/android/resources/drawable-hdpi-v11/tabs_plus.png
copy to mobile/android/base/resources/drawable-hdpi-v11/tabs_plus.png

copy from embedding/android/resources/drawable-hdpi-v11/tabs_pressed.png
copy to mobile/android/base/resources/drawable-hdpi-v11/tabs_pressed.png

copy from embedding/android/resources/drawable-hdpi-v8/address_bar_url_bg.9.png
copy to mobile/android/base/resources/drawable-hdpi-v8/address_bar_url_bg.9.png

copy from embedding/android/resources/drawable-hdpi-v8/doorhanger_arrow.png
copy to mobile/android/base/resources/drawable-hdpi-v8/doorhanger_arrow.png

copy from embedding/android/resources/drawable-hdpi-v8/doorhanger_bg.9.png
copy to mobile/android/base/resources/drawable-hdpi-v8/doorhanger_bg.9.png

copy from embedding/android/resources/drawable-hdpi-v8/doorhanger_popup_bg.9.png
copy to mobile/android/base/resources/drawable-hdpi-v8/doorhanger_popup_bg.9.png

copy from embedding/android/resources/drawable-hdpi-v8/doorhanger_shadow_bg.9.png
copy to mobile/android/base/resources/drawable-hdpi-v8/doorhanger_shadow_bg.9.png

copy from embedding/android/resources/drawable-hdpi-v8/ic_menu_bookmark_add.png
copy to mobile/android/base/resources/drawable-hdpi-v8/ic_menu_bookmark_add.png

copy from embedding/android/resources/drawable-hdpi-v8/ic_menu_bookmark_remove.png
copy to mobile/android/base/resources/drawable-hdpi-v8/ic_menu_bookmark_remove.png

copy from embedding/android/resources/drawable-hdpi-v8/ic_menu_find_in_page.png
copy to mobile/android/base/resources/drawable-hdpi-v8/ic_menu_find_in_page.png

copy from embedding/android/resources/drawable-hdpi-v8/ic_menu_forward.png
copy to mobile/android/base/resources/drawable-hdpi-v8/ic_menu_forward.png

copy from embedding/android/resources/drawable-hdpi-v8/ic_menu_reload.png
copy to mobile/android/base/resources/drawable-hdpi-v8/ic_menu_reload.png

copy from embedding/android/resources/drawable-hdpi-v8/ic_menu_save_as_pdf.png
copy to mobile/android/base/resources/drawable-hdpi-v8/ic_menu_save_as_pdf.png

copy from embedding/android/resources/drawable-hdpi-v8/ic_menu_share.png
copy to mobile/android/base/resources/drawable-hdpi-v8/ic_menu_share.png

copy from embedding/android/resources/drawable-hdpi-v8/site_security_lock.png
copy to mobile/android/base/resources/drawable-hdpi-v8/site_security_lock.png

copy from embedding/android/resources/drawable-hdpi-v8/tabs_more.png
copy to mobile/android/base/resources/drawable-hdpi-v8/tabs_more.png

copy from embedding/android/resources/drawable-hdpi-v8/tabs_normal.png
copy to mobile/android/base/resources/drawable-hdpi-v8/tabs_normal.png

copy from embedding/android/resources/drawable-hdpi-v8/tabs_plus.png
copy to mobile/android/base/resources/drawable-hdpi-v8/tabs_plus.png

copy from embedding/android/resources/drawable-hdpi-v8/tabs_pressed.png
copy to mobile/android/base/resources/drawable-hdpi-v8/tabs_pressed.png

copy from embedding/android/resources/drawable-hdpi-v8/urlbar_stop.png
copy to mobile/android/base/resources/drawable-hdpi-v8/urlbar_stop.png

copy from embedding/android/resources/drawable-hdpi-v9/ic_menu_bookmark_add.png
copy to mobile/android/base/resources/drawable-hdpi-v9/ic_menu_bookmark_add.png

copy from embedding/android/resources/drawable-hdpi-v9/ic_menu_bookmark_remove.png
copy to mobile/android/base/resources/drawable-hdpi-v9/ic_menu_bookmark_remove.png

copy from embedding/android/resources/drawable-hdpi-v9/ic_menu_find_in_page.png
copy to mobile/android/base/resources/drawable-hdpi-v9/ic_menu_find_in_page.png

copy from embedding/android/resources/drawable-hdpi-v9/ic_menu_forward.png
copy to mobile/android/base/resources/drawable-hdpi-v9/ic_menu_forward.png

copy from embedding/android/resources/drawable-hdpi-v9/ic_menu_reload.png
copy to mobile/android/base/resources/drawable-hdpi-v9/ic_menu_reload.png

copy from embedding/android/resources/drawable-hdpi-v9/ic_menu_save_as_pdf.png
copy to mobile/android/base/resources/drawable-hdpi-v9/ic_menu_save_as_pdf.png

copy from embedding/android/resources/drawable-hdpi-v9/ic_menu_share.png
copy to mobile/android/base/resources/drawable-hdpi-v9/ic_menu_share.png

copy from embedding/android/resources/drawable-mdpi-v11/address_bar_url_bg.9.png
copy to mobile/android/base/resources/drawable-mdpi-v11/address_bar_url_bg.9.png

copy from embedding/android/resources/drawable-mdpi-v11/ic_menu_bookmark_add.png
copy to mobile/android/base/resources/drawable-mdpi-v11/ic_menu_bookmark_add.png

copy from embedding/android/resources/drawable-mdpi-v11/ic_menu_bookmark_remove.png
copy to mobile/android/base/resources/drawable-mdpi-v11/ic_menu_bookmark_remove.png

copy from embedding/android/resources/drawable-mdpi-v11/ic_menu_find_in_page.png
copy to mobile/android/base/resources/drawable-mdpi-v11/ic_menu_find_in_page.png

copy from embedding/android/resources/drawable-mdpi-v11/ic_menu_forward.png
copy to mobile/android/base/resources/drawable-mdpi-v11/ic_menu_forward.png

copy from embedding/android/resources/drawable-mdpi-v11/ic_menu_reload.png
copy to mobile/android/base/resources/drawable-mdpi-v11/ic_menu_reload.png

copy from embedding/android/resources/drawable-mdpi-v11/ic_menu_save_as_pdf.png
copy to mobile/android/base/resources/drawable-mdpi-v11/ic_menu_save_as_pdf.png

copy from embedding/android/resources/drawable-mdpi-v11/ic_menu_share.png
copy to mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png

copy from embedding/android/resources/drawable-mdpi-v11/tabs_more.png
copy to mobile/android/base/resources/drawable-mdpi-v11/tabs_more.png

copy from embedding/android/resources/drawable-mdpi-v11/tabs_normal.png
copy to mobile/android/base/resources/drawable-mdpi-v11/tabs_normal.png

copy from embedding/android/resources/drawable-mdpi-v11/tabs_plus.png
copy to mobile/android/base/resources/drawable-mdpi-v11/tabs_plus.png

copy from embedding/android/resources/drawable-mdpi-v11/tabs_pressed.png
copy to mobile/android/base/resources/drawable-mdpi-v11/tabs_pressed.png

copy from embedding/android/resources/drawable-mdpi-v8/address_bar_url_bg.9.png
copy to mobile/android/base/resources/drawable-mdpi-v8/address_bar_url_bg.9.png

copy from embedding/android/resources/drawable-mdpi-v8/doorhanger_arrow.png
copy to mobile/android/base/resources/drawable-mdpi-v8/doorhanger_arrow.png

copy from embedding/android/resources/drawable-mdpi-v8/doorhanger_bg.9.png
copy to mobile/android/base/resources/drawable-mdpi-v8/doorhanger_bg.9.png

copy from embedding/android/resources/drawable-mdpi-v8/doorhanger_popup_bg.9.png
copy to mobile/android/base/resources/drawable-mdpi-v8/doorhanger_popup_bg.9.png

copy from embedding/android/resources/drawable-mdpi-v8/doorhanger_shadow_bg.9.png
copy to mobile/android/base/resources/drawable-mdpi-v8/doorhanger_shadow_bg.9.png

copy from embedding/android/resources/drawable-mdpi-v8/ic_menu_bookmark_add.png
copy to mobile/android/base/resources/drawable-mdpi-v8/ic_menu_bookmark_add.png

copy from embedding/android/resources/drawable-mdpi-v8/ic_menu_bookmark_remove.png
copy to mobile/android/base/resources/drawable-mdpi-v8/ic_menu_bookmark_remove.png

copy from embedding/android/resources/drawable-mdpi-v8/ic_menu_find_in_page.png
copy to mobile/android/base/resources/drawable-mdpi-v8/ic_menu_find_in_page.png

copy from embedding/android/resources/drawable-mdpi-v8/ic_menu_forward.png
copy to mobile/android/base/resources/drawable-mdpi-v8/ic_menu_forward.png

copy from embedding/android/resources/drawable-mdpi-v8/ic_menu_reload.png
copy to mobile/android/base/resources/drawable-mdpi-v8/ic_menu_reload.png

copy from embedding/android/resources/drawable-mdpi-v8/ic_menu_save_as_pdf.png
copy to mobile/android/base/resources/drawable-mdpi-v8/ic_menu_save_as_pdf.png

copy from embedding/android/resources/drawable-mdpi-v8/ic_menu_share.png
copy to mobile/android/base/resources/drawable-mdpi-v8/ic_menu_share.png

copy from embedding/android/resources/drawable-mdpi-v8/site_security_lock.png
copy to mobile/android/base/resources/drawable-mdpi-v8/site_security_lock.png

copy from embedding/android/resources/drawable-mdpi-v8/tabs_more.png
copy to mobile/android/base/resources/drawable-mdpi-v8/tabs_more.png

copy from embedding/android/resources/drawable-mdpi-v8/tabs_normal.png
copy to mobile/android/base/resources/drawable-mdpi-v8/tabs_normal.png

copy from embedding/android/resources/drawable-mdpi-v8/tabs_plus.png
copy to mobile/android/base/resources/drawable-mdpi-v8/tabs_plus.png

copy from embedding/android/resources/drawable-mdpi-v8/tabs_pressed.png
copy to mobile/android/base/resources/drawable-mdpi-v8/tabs_pressed.png

copy from embedding/android/resources/drawable-mdpi-v8/urlbar_stop.png
copy to mobile/android/base/resources/drawable-mdpi-v8/urlbar_stop.png

copy from embedding/android/resources/drawable-mdpi-v9/ic_menu_bookmark_add.png
copy to mobile/android/base/resources/drawable-mdpi-v9/ic_menu_bookmark_add.png

copy from embedding/android/resources/drawable-mdpi-v9/ic_menu_bookmark_remove.png
copy to mobile/android/base/resources/drawable-mdpi-v9/ic_menu_bookmark_remove.png

copy from embedding/android/resources/drawable-mdpi-v9/ic_menu_find_in_page.png
copy to mobile/android/base/resources/drawable-mdpi-v9/ic_menu_find_in_page.png

copy from embedding/android/resources/drawable-mdpi-v9/ic_menu_forward.png
copy to mobile/android/base/resources/drawable-mdpi-v9/ic_menu_forward.png

copy from embedding/android/resources/drawable-mdpi-v9/ic_menu_reload.png
copy to mobile/android/base/resources/drawable-mdpi-v9/ic_menu_reload.png

copy from embedding/android/resources/drawable-mdpi-v9/ic_menu_save_as_pdf.png
copy to mobile/android/base/resources/drawable-mdpi-v9/ic_menu_save_as_pdf.png

copy from embedding/android/resources/drawable-mdpi-v9/ic_menu_share.png
copy to mobile/android/base/resources/drawable-mdpi-v9/ic_menu_share.png

copy from embedding/android/resources/drawable-xhdpi-v11/address_bar_url_bg.9.png
copy to mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_bg.9.png

copy from embedding/android/resources/drawable-xhdpi-v11/ic_menu_bookmark_add.png
copy to mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_add.png

copy from embedding/android/resources/drawable-xhdpi-v11/ic_menu_bookmark_remove.png
copy to mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_remove.png

copy from embedding/android/resources/drawable-xhdpi-v11/ic_menu_find_in_page.png
copy to mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_find_in_page.png

copy from embedding/android/resources/drawable-xhdpi-v11/ic_menu_foward.png
copy to mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_foward.png

copy from embedding/android/resources/drawable-xhdpi-v11/ic_menu_reload.png
copy to mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_reload.png

copy from embedding/android/resources/drawable-xhdpi-v11/ic_menu_save_as_pdf.png
copy to mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_save_as_pdf.png

copy from embedding/android/resources/drawable-xhdpi-v11/ic_menu_share.png
copy to mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png

copy from embedding/android/resources/drawable-xhdpi-v11/tabs_more.png
copy to mobile/android/base/resources/drawable-xhdpi-v11/tabs_more.png

copy from embedding/android/resources/drawable-xhdpi-v11/tabs_normal.png
copy to mobile/android/base/resources/drawable-xhdpi-v11/tabs_normal.png

copy from embedding/android/resources/drawable-xhdpi-v11/tabs_plus.png
copy to mobile/android/base/resources/drawable-xhdpi-v11/tabs_plus.png

copy from embedding/android/resources/drawable-xhdpi-v11/tabs_pressed.png
copy to mobile/android/base/resources/drawable-xhdpi-v11/tabs_pressed.png

copy from embedding/android/resources/drawable/address_bar_bg.xml
copy to mobile/android/base/resources/drawable/address_bar_bg.xml

copy from embedding/android/resources/drawable/address_bar_url_default.xml
copy to mobile/android/base/resources/drawable/address_bar_url_default.xml

copy from embedding/android/resources/drawable/address_bar_url_pressed.xml
copy to mobile/android/base/resources/drawable/address_bar_url_pressed.xml

copy from embedding/android/resources/drawable/awesomebar_tab_focus.xml
copy to mobile/android/base/resources/drawable/awesomebar_tab_focus.xml

copy from embedding/android/resources/drawable/awesomebar_tab_focus_selected.xml
copy to mobile/android/base/resources/drawable/awesomebar_tab_focus_selected.xml

copy from embedding/android/resources/drawable/awesomebar_tab_indicator.xml
copy to mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml

copy from embedding/android/resources/drawable/awesomebar_tab_press.xml
copy to mobile/android/base/resources/drawable/awesomebar_tab_press.xml

copy from embedding/android/resources/drawable/awesomebar_tab_press_selected.xml
copy to mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml

copy from embedding/android/resources/drawable/awesomebar_tab_selected.xml
copy to mobile/android/base/resources/drawable/awesomebar_tab_selected.xml

copy from embedding/android/resources/drawable/awesomebar_tab_unselected.xml
copy to mobile/android/base/resources/drawable/awesomebar_tab_unselected.xml

copy from embedding/android/resources/drawable/checkerboard.png
copy to mobile/android/base/resources/drawable/checkerboard.png

copy from embedding/android/resources/drawable/crash_reporter.png
copy to mobile/android/base/resources/drawable/crash_reporter.png

copy from embedding/android/resources/drawable/desktop_notification.png
copy to mobile/android/base/resources/drawable/desktop_notification.png

copy from embedding/android/resources/drawable/favicon.png
copy to mobile/android/base/resources/drawable/favicon.png

copy from embedding/android/resources/drawable/progress_spinner.xml
copy to mobile/android/base/resources/drawable/progress_spinner.xml

copy from embedding/android/resources/drawable/progress_spinner_1.png
copy to mobile/android/base/resources/drawable/progress_spinner_1.png

copy from embedding/android/resources/drawable/progress_spinner_10.png
copy to mobile/android/base/resources/drawable/progress_spinner_10.png

copy from embedding/android/resources/drawable/progress_spinner_11.png
copy to mobile/android/base/resources/drawable/progress_spinner_11.png

copy from embedding/android/resources/drawable/progress_spinner_12.png
copy to mobile/android/base/resources/drawable/progress_spinner_12.png

copy from embedding/android/resources/drawable/progress_spinner_13.png
copy to mobile/android/base/resources/drawable/progress_spinner_13.png

copy from embedding/android/resources/drawable/progress_spinner_14.png
copy to mobile/android/base/resources/drawable/progress_spinner_14.png

copy from embedding/android/resources/drawable/progress_spinner_15.png
copy to mobile/android/base/resources/drawable/progress_spinner_15.png

copy from embedding/android/resources/drawable/progress_spinner_16.png
copy to mobile/android/base/resources/drawable/progress_spinner_16.png

copy from embedding/android/resources/drawable/progress_spinner_17.png
copy to mobile/android/base/resources/drawable/progress_spinner_17.png

copy from embedding/android/resources/drawable/progress_spinner_18.png
copy to mobile/android/base/resources/drawable/progress_spinner_18.png

copy from embedding/android/resources/drawable/progress_spinner_2.png
copy to mobile/android/base/resources/drawable/progress_spinner_2.png

copy from embedding/android/resources/drawable/progress_spinner_3.png
copy to mobile/android/base/resources/drawable/progress_spinner_3.png

copy from embedding/android/resources/drawable/progress_spinner_4.png
copy to mobile/android/base/resources/drawable/progress_spinner_4.png

copy from embedding/android/resources/drawable/progress_spinner_5.png
copy to mobile/android/base/resources/drawable/progress_spinner_5.png

copy from embedding/android/resources/drawable/progress_spinner_6.png
copy to mobile/android/base/resources/drawable/progress_spinner_6.png

copy from embedding/android/resources/drawable/progress_spinner_7.png
copy to mobile/android/base/resources/drawable/progress_spinner_7.png

copy from embedding/android/resources/drawable/progress_spinner_8.png
copy to mobile/android/base/resources/drawable/progress_spinner_8.png

copy from embedding/android/resources/drawable/progress_spinner_9.png
copy to mobile/android/base/resources/drawable/progress_spinner_9.png

copy from embedding/android/resources/drawable/shadow.png
copy to mobile/android/base/resources/drawable/shadow.png

copy from embedding/android/resources/drawable/site_security_level.xml
copy to mobile/android/base/resources/drawable/site_security_level.xml

copy from embedding/android/resources/drawable/start.png
copy to mobile/android/base/resources/drawable/start.png

copy from embedding/android/resources/drawable/tab_close.png
copy to mobile/android/base/resources/drawable/tab_close.png

copy from embedding/android/resources/drawable/tab_new.png
copy to mobile/android/base/resources/drawable/tab_new.png

copy from embedding/android/resources/drawable/tabs_button.xml
copy to mobile/android/base/resources/drawable/tabs_button.xml

copy from embedding/android/resources/drawable/tabs_level.xml
copy to mobile/android/base/resources/drawable/tabs_level.xml

copy from embedding/android/resources/drawable/tabs_tray_bg.9.png
copy to mobile/android/base/resources/drawable/tabs_tray_bg.9.png

copy from embedding/android/resources/layout/awesomebar_header_row.xml
copy to mobile/android/base/resources/layout/awesomebar_header_row.xml

copy from embedding/android/resources/layout/awesomebar_row.xml
copy to mobile/android/base/resources/layout/awesomebar_row.xml

copy from embedding/android/resources/layout/awesomebar_search.xml
copy to mobile/android/base/resources/layout/awesomebar_search.xml

copy from embedding/android/resources/layout/awesomebar_tab_indicator.xml
copy to mobile/android/base/resources/layout/awesomebar_tab_indicator.xml

copy from embedding/android/resources/layout/awesomebar_tabs.xml
copy to mobile/android/base/resources/layout/awesomebar_tabs.xml

copy from embedding/android/resources/layout/browser_toolbar.xml
copy to mobile/android/base/resources/layout/browser_toolbar.xml

copy from embedding/android/resources/layout/crash_reporter.xml
copy to mobile/android/base/resources/layout/crash_reporter.xml

copy from embedding/android/resources/layout/doorhanger.xml
copy to mobile/android/base/resources/layout/doorhanger.xml

copy from embedding/android/resources/layout/doorhangerpopup.xml
copy to mobile/android/base/resources/layout/doorhangerpopup.xml

copy from embedding/android/resources/layout/gecko_app.xml
copy to mobile/android/base/resources/layout/gecko_app.xml

copy from embedding/android/resources/layout/gecko_menu.xml
copy to mobile/android/base/resources/layout/gecko_menu.xml

copy from embedding/android/resources/layout/launch_app_list.xml
copy to mobile/android/base/resources/layout/launch_app_list.xml

copy from embedding/android/resources/layout/launch_app_listitem.xml
copy to mobile/android/base/resources/layout/launch_app_listitem.xml

copy from embedding/android/resources/layout/list_item_header.xml
copy to mobile/android/base/resources/layout/list_item_header.xml

copy from embedding/android/resources/layout/notification_icon_text.xml
copy to mobile/android/base/resources/layout/notification_icon_text.xml

copy from embedding/android/resources/layout/notification_progress.xml
copy to mobile/android/base/resources/layout/notification_progress.xml

copy from embedding/android/resources/layout/notification_progress_text.xml
copy to mobile/android/base/resources/layout/notification_progress_text.xml

copy from embedding/android/resources/layout/select_dialog_list.xml
copy to mobile/android/base/resources/layout/select_dialog_list.xml

copy from embedding/android/resources/layout/tabs_row.xml
copy to mobile/android/base/resources/layout/tabs_row.xml

copy from embedding/android/resources/layout/tabs_tray.xml
copy to mobile/android/base/resources/layout/tabs_tray.xml

copy from embedding/android/resources/values/arrays.xml
copy to mobile/android/base/resources/values/arrays.xml

copy from embedding/android/resources/values/colors.xml
copy to mobile/android/base/resources/values/colors.xml

copy from embedding/android/resources/values/styles.xml
copy to mobile/android/base/resources/values/styles.xml

copy from embedding/android/resources/values/themes.xml
copy to mobile/android/base/resources/values/themes.xml

copy from embedding/android/resources/xml/preferences.xml
copy to mobile/android/base/resources/xml/preferences.xml

copy from embedding/android/strings.xml.in
copy to mobile/android/base/strings.xml.in

copy from embedding/android/ui/PanZoomController.java
copy to mobile/android/base/ui/PanZoomController.java

copy from embedding/android/ui/ViewportController.java
copy to mobile/android/base/ui/ViewportController.java

--- a/mobile/android/locales/Makefile.in
+++ b/mobile/android/locales/Makefile.in
@@ -121,17 +121,17 @@ libs-%:
 chrome-%:
 	@$(MAKE) -C $(DEPTH)/toolkit/locales chrome-$*
 	@$(MAKE) -C $(DEPTH)/services/sync/locales chrome AB_CD=$*
 	@$(MAKE) -B bookmarks.json AB_CD=$*
 	@$(MAKE) -B searchplugins AB_CD=$*
 	@$(MAKE) chrome AB_CD=$*
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
 ifeq ($(OS_TARGET),Android)
-	@$(MAKE) -C $(DEPTH)/embedding/android chrome AB_CD=$*
+	@$(MAKE) -C $(DEPTH)/mobile/android/base chrome AB_CD=$*
 endif
 
 # This is a generic target that will make a langpack and repack tarball
 # builds. It is called from the tinderbox scripts. Alter it with caution.
 
 installers-%: clobber-% langpack-% repackage-zip-%
 	@echo "repackaging done"
 

--- a/mobile/android/locales/filter.py
+++ b/mobile/android/locales/filter.py
@@ -35,17 +35,17 @@
 #
 # ***** END LICENSE BLOCK *****
 
 
 def test(mod, path, entity = None):
   import re
   # ignore anything but mobile, which is our local repo checkout name
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
-                 "services/sync", "embedding/android",
+                 "services/sync", "mobile/android/base",
                  "mobile"):
     return False
 
   # Ignore Lorentz strings, at least temporarily
   if mod == "toolkit" and path == "chrome/mozapps/plugins/plugins.dtd":
     if entity.startswith('reloadPlugin.'): return False
     if entity.startswith('report.'): return False
 

--- a/mobile/android/locales/l10n-central.ini
+++ b/mobile/android/locales/l10n-central.ini
@@ -1,21 +1,21 @@
-[general]
++[general]
 depth = ../..
 source-depth = ..
 all = locales/all-locales
 
 [compare]
 dirs = mobile/android
 tld = mobile/android
 
 [includes]
 toolkit = toolkit/locales/l10n.ini
 services_sync = services/sync/locales/l10n.ini
-embedding_android = embedding/android/locales/l10n.ini
+embedding_android = mobile/android/base/locales/l10n.ini
 
 [include_toolkit]
 type = hg
 mozilla = mozilla-central
 repo = http://hg.mozilla.org/
 l10n.ini = toolkit/locales/l10n.ini
 
 [include_services_sync]
@@ -23,9 +23,9 @@ type = hg
 mozilla = mozilla-central
 repo = http://hg.mozilla.org/
 l10n.ini = services/sync/locales/l10n.ini
 
 [include_embedding_android]
 type = hg
 mozilla = mozilla-central
 repo = http://hg.mozilla.org/
-l10n.ini = embedding/android/locales/l10n.ini
+l10n.ini = mobile/android/base/locales/l10n.ini

--- a/mobile/android/locales/l10n-mozilla-2.0.ini
+++ b/mobile/android/locales/l10n-mozilla-2.0.ini
@@ -5,17 +5,17 @@ all = locales/all-locales
 
 [compare]
 dirs = mobile/android
 tld = mobile/android
 
 [includes]
 toolkit = toolkit/locales/l10n.ini
 services_sync = services/sync/locales/l10n.ini
-embedding_android = embedding/android/locales/l10n.ini
+embedding_android = mobile/android/base/locales/l10n.ini
 
 [include_toolkit]
 type = hg
 mozilla = releases/mozilla-2.0
 repo = http://hg.mozilla.org/
 l10n.ini = toolkit/locales/l10n.ini
 
 [include_services_sync]
@@ -23,9 +23,9 @@ type = hg
 mozilla = releases/mozilla-2.0
 repo = http://hg.mozilla.org/
 l10n.ini = services/sync/locales/l10n.ini
 
 [include_embedding_android]
 type = hg
 mozilla = releases/mozilla-2.0
 repo = http://hg.mozilla.org/
-l10n.ini = embedding/android/locales/l10n.ini
+l10n.ini = mobile/android/base/locales/l10n.ini

--- a/mobile/android/locales/l10n.ini
+++ b/mobile/android/locales/l10n.ini
@@ -3,9 +3,9 @@ depth = ../..
 all = mobile/android/locales/all-locales
 
 [compare]
 dirs = mobile/android
 
 [includes]
 toolkit = toolkit/locales/l10n.ini
 services_sync = services/sync/locales/l10n.ini
-embedding_android = embedding/android/locales/l10n.ini
+embedding_android = mobile/android/base/locales/l10n.ini

--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -317,18 +317,18 @@ ifdef MOZ_THUMB2
 ABI_DIR = armeabi-v7a
 else
 ABI_DIR = armeabi
 endif
 endif
 
 PKG_SUFFIX      = .apk
 INNER_MAKE_PACKAGE	= \
-  make -C ../embedding/android gecko.ap_ && \
-  cp ../embedding/android/gecko.ap_ $(_ABS_DIST) && \
+  make -C ../mobile/android/base gecko.ap_ && \
+  cp ../mobile/android/base/gecko.ap_ $(_ABS_DIST) && \
   ( cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && \
     mkdir -p lib/$(ABI_DIR) && \
     mv libmozutils.so $(MOZ_CHILD_PROCESS_NAME) lib/$(ABI_DIR) && \
     rm -f lib.id && \
     for SOMELIB in *.so ; \
     do \
       printf "`basename $$SOMELIB`:`$(_ABS_DIST)/host/bin/file_id $$SOMELIB`\n" >> lib.id ; \
     done && \

--- a/widget/src/android/nsWindow.cpp
+++ b/widget/src/android/nsWindow.cpp
@@ -74,17 +74,17 @@ using mozilla::unused;
 #include "nsTArray.h"
 
 #include "AndroidBridge.h"
 
 #include "imgIEncoder.h"
 
 #include "nsStringGlue.h"
 
-// NB: Keep these in sync with LayerController.java in embedding/android/.
+// NB: Keep these in sync with LayerController.java in mobile/android/base and embedding/android/.
 #define TILE_WIDTH      1024
 #define TILE_HEIGHT     2048
 
 using namespace mozilla;
 
 NS_IMPL_ISUPPORTS_INHERITED0(nsWindow, nsBaseWidget)
 
 // The dimensions of the current android view