Allow use of alternative to bash as the build shell.
Change-Id: Ib92217f90c98e04a1d16efd4904d9d7ba9dda3cf http://b/issue?id=2557214
This commit is contained in:
parent
4b2eb9734f
commit
2ce495a0a7
2 changed files with 8 additions and 4 deletions
|
@ -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 @@ TARGET_AVAILABLE_SDK_VERSIONS := current \
|
|||
|
||||
|
||||
INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.xml
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue