Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ce495a0 authored by Ying Wang's avatar Ying Wang
Browse files

Allow use of alternative to bash as the build shell.

Change-Id: Ib92217f90c98e04a1d16efd4904d9d7ba9dda3cf
http://b/issue?id=2557214
parent 4b2eb973
Loading
Loading
Loading
Loading
+4 −3
Original line number Original line Diff line number Diff line
@@ -3,10 +3,14 @@
# current configuration and platform, which
# current configuration and platform, which
# are not specific to what is being built.
# 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
# Use bash, not whatever shell somebody has installed as /bin/sh
# This is repeated from main.mk, since envsetup.sh runs this file
# This is repeated from main.mk, since envsetup.sh runs this file
# directly.
# directly.
SHELL := /bin/bash
SHELL := /bin/bash
endif


# Tell python not to spam the source tree with .pyc files.  This
# Tell python not to spam the source tree with .pyc files.  This
# only has an effect on python 2.6 and above.
# 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
INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.xml


+4 −1
Original line number Original line Diff line number Diff line

ifdef ANDROID_BUILD_SHELL
SHELL := $(ANDROID_BUILD_SHELL)
else
# Use bash, not whatever shell somebody has installed as /bin/sh
# Use bash, not whatever shell somebody has installed as /bin/sh
# This is repeated in config.mk, since envsetup.sh runs that file
# This is repeated in config.mk, since envsetup.sh runs that file
# directly.
# directly.
SHELL := /bin/bash
SHELL := /bin/bash
endif


# this turns off the suffix rules built into make
# this turns off the suffix rules built into make
.SUFFIXES:
.SUFFIXES: