diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-01-15 10:14:49 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-15 10:14:49 -0800 |
| commit | 4efb39d38f0a3fee58f47c9bbeed846e0618727f (patch) | |
| tree | be15db5af4c3976765f451e9cda09b4fa7f78348 | |
| parent | 30f2e9449d96cf206de006a781d92d62daeea4a0 (diff) | |
| parent | 9d320cab5c58903f174f43732cba3e932994b799 (diff) | |
| download | mksh-4efb39d38f0a3fee58f47c9bbeed846e0618727f.tar.gz | |
Merge "Convert Android.mk file to Android.bp" am: 4c43f7c257 am: 2165b8570d
am: 9d320cab5c
Change-Id: I0844edd11d72090e72f4b5d60c518901e7e831d7
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | Android.mk | 25 |
2 files changed, 14 insertions, 25 deletions
@@ -139,3 +139,17 @@ cc_binary { "-DMKSH_DEFPATH_OVERRIDE=\"/vendor/bin:/vendor/xbin\"", ], } + +// /system/etc/mkshrc +prebuilt_etc { + name: "mkshrc", + src: "mkshrc", +} + +// /vendor/etc/mkshrc +prebuilt_etc { + name: "mkshrc_vendor", + src: "mkshrc_vendor", + filename: "mkshrc", + soc_specific: true, +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 772b0a9..0000000 --- a/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright © 2010, 2013 -# Thorsten Glaser <t.glaser@tarent.de> -# This file is provided under the same terms as mksh. - -LOCAL_PATH := $(call my-dir) - -# /system/etc/mkshrc - -include $(CLEAR_VARS) - -LOCAL_MODULE := mkshrc -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT)/etc -LOCAL_SRC_FILES := $(LOCAL_MODULE) -include $(BUILD_PREBUILT) - -# /vendor/etc/mkshrc -include $(CLEAR_VARS) - -LOCAL_MODULE := mkshrc_vendor -LOCAL_MODULE_STEM := mkshrc -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) -LOCAL_SRC_FILES := $(LOCAL_MODULE) -include $(BUILD_PREBUILT) |