diff options
| author | Will Drewry <drewry@google.com> | 2015-10-26 14:51:36 -0700 |
|---|---|---|
| committer | Will Drewry <drewry@google.com> | 2015-10-26 14:51:36 -0700 |
| commit | 4e181654d757b14b40fb5b888ac9f6d634c025c7 (patch) | |
| tree | 6984d8435ea875e2226382bab28daa87515e7223 /build | |
| parent | e7428b0eb1ebada1330bbb3af89a5f5c41cc7c52 (diff) | |
| download | bdk-4e181654d757b14b40fb5b888ac9f6d634c025c7.tar.gz | |
bdk/build: swap source for .
If the user's default shell is dash, source
will cause problems. While bash is required for
Android's build, it's not clear that it is required
to be the default /bin/sh.
As such, we shouldn't add explicit bash-isms unless
invoking explicitly with bash.
BUG=25223846
Change-Id: I75db1445750de3231289af01f93f97b89bcefa99
Diffstat (limited to 'build')
| -rw-r--r-- | build/wrap-common.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/wrap-common.mk b/build/wrap-common.mk index cff50a5..88e40de 100644 --- a/build/wrap-common.mk +++ b/build/wrap-common.mk @@ -108,7 +108,7 @@ endef # TODO(wad) Make tee optional define build-product $(Q)(cd "$(2)" && \ - source build/envsetup.sh && \ + . build/envsetup.sh && \ add_lunch_combo "$(3)-$(6)" && \ lunch "$(3)-$(6)" && \ PATH=$(2)/java/bin:$$PATH $(MAKE) $(MAKECMDGOALS) "OUT_DIR=$(5)/out-$(4)" KATI_EMULATE_FIND=false || \ @@ -123,7 +123,7 @@ endef define build-product-here $(Q)echo "Building in subtree $(7) . . ." $(Q)(cd "$(2)" && \ - source build/envsetup.sh && \ + . build/envsetup.sh && \ add_lunch_combo "$(3)-$(6)" && \ lunch "$(3)-$(6)" && \ cd "product/$(PRODUCT_MANUFACTURER)/$(PRODUCT_NAME)/$(subst $(PRODUCT_DIR)/,,$(7))" && \ |