diff --git a/core/config.mk b/core/config.mk
index 64a5dd0..71c9fdc 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -3,10 +3,14 @@
 # current configuration and platform, which
 # are not specific to what is being built.
 
+ifdef ANDROID_BUILD_SHELL
+SHELL := $(ANDROID_BUILD_SHELL)
+else
 # Use bash, not whatever shell somebody has installed as /bin/sh
 # This is repeated from main.mk, since envsetup.sh runs this file
 # directly.
 SHELL := /bin/bash
+endif
 
 # Tell python not to spam the source tree with .pyc files.  This
 # only has an effect on python 2.6 and above.
@@ -325,6 +329,3 @@
 
 
 INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.xml
-
-
-
diff --git a/core/main.mk b/core/main.mk
index b1a5bff..3da799b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1,8 +1,11 @@
-
+ifdef ANDROID_BUILD_SHELL
+SHELL := $(ANDROID_BUILD_SHELL)
+else
 # Use bash, not whatever shell somebody has installed as /bin/sh
 # This is repeated in config.mk, since envsetup.sh runs that file
 # directly.
 SHELL := /bin/bash
+endif
 
 # this turns off the suffix rules built into make
 .SUFFIXES: