summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpadarshr <padarshr@codeaurora.org>2017-06-27 19:26:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-27 19:26:00 +0000
commit75a803934cdf1d3970cef80f2001016d3c9d4249 (patch)
tree5f6ce3ed341a7a739301f1c02f409d587d1fca92
parent7742e45f68aca852435c250627832a5087ef8fd7 (diff)
parent0a685140c5e4e0c00d7ed1d427ac0517d3df0d10 (diff)
downloadmksh-oreo-mr1-dev.tar.gz
Merge "Build vendor shell unconditionally." am: bba8f4a328 am: 8547d5a6a9 am: 83c29a0b24oreo-mr1-dev
am: 0a685140c5 Change-Id: I0960b248ffc238f017a7fce637866b0f08805dfb
-rw-r--r--Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index d798297..829fc7b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -92,7 +92,6 @@ LOCAL_CFLAGS += $(MKSH_CFLAGS)
include $(BUILD_EXECUTABLE)
-ifeq ($(PRODUCT_FULL_TREBLE),true)
# /vendor/etc/mkshrc
include $(CLEAR_VARS)
@@ -126,7 +125,6 @@ LOCAL_CFLAGS += \
LOCAL_CFLAGS += $(MKSH_CFLAGS)
include $(BUILD_EXECUTABLE)
-endif
MKSH_SRC_FILES:=
MKSH_CFLAGS:=