OSDN Git Service

Merge "Build vendor shell unconditionally." am: bba8f4a328
authorpadarshr <padarshr@codeaurora.org>
Tue, 27 Jun 2017 19:00:16 +0000 (19:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 19:00:16 +0000 (19:00 +0000)
am: 8547d5a6a9

Change-Id: I338f80a7e8bb5132988c9030ad70a4cb4c05ee75

Android.mk

index d798297..829fc7b 100644 (file)
@@ -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:=