[1/3] vim: move to system_ext
Change-Id: I71b228489cf0fd37242e2fc59e41171b30e83521
diff --git a/Android.mk b/Android.mk
index 882a300..8b13062 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,8 +9,8 @@
LOCAL_MODULE := vimrc
LOCAL_MODULE_CLASS := ETC
-
LOCAL_SRC_FILES := vimrc.android
+LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_EXT_ETC)
include $(BUILD_PREBUILT)
@@ -99,9 +99,12 @@
libm \
libdl
+VIM_RC_FILE := $(TARGET_OUT_SYSTEM_EXT_ETC)/vimrc
+
+# DONT REPLACE system_ext here - path is used during runtime
LOCAL_CFLAGS += \
-DHAVE_CONFIG_H \
- -DSYS_VIMRC_FILE=\"/system/etc/vimrc\"
+ -DSYS_VIMRC_FILE=\"/system_ext/etc/vimrc\"
# vim variants: TINY SMALL CM NORMAL BIG HUGE
#
@@ -130,13 +133,13 @@
LOCAL_CFLAGS += -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations
LOCAL_MODULE := vim
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_EXT_EXECUTABLES)
LOCAL_REQUIRED_MODULES := vimrc
include $(BUILD_EXECUTABLE)
# Create vi symlink
-$(shell mkdir -p $(TARGET_OUT_OPTIONAL_EXECUTABLES))
-$(shell pushd $(TARGET_OUT_OPTIONAL_EXECUTABLES) > /dev/null && ln -sf vim vi && popd > /dev/null)
+$(shell mkdir -p $(TARGET_OUT_SYSTEM_EXT_EXECUTABLES))
+$(shell pushd $(TARGET_OUT_SYSTEM_EXT_EXECUTABLES) > /dev/null && ln -sf vim vi && popd > /dev/null)
# ========================================================
# vim runtime files
@@ -195,7 +198,7 @@
dist/ft.vim \
spacehi.vim
-VIM_SHARED := $(TARGET_OUT)/usr/share/vim
+VIM_SHARED := $(TARGET_OUT_SYSTEM_EXT)/usr/share/vim
RUNTIME_FILES := \
$(vim_runtime_files) \
diff --git a/src/auto/pathdef.c b/src/auto/pathdef.c
index 3994a47..2057237 100644
--- a/src/auto/pathdef.c
+++ b/src/auto/pathdef.c
@@ -2,8 +2,8 @@
/* This file is automatically created by Makefile
* DO NOT EDIT! Change Makefile only. */
#include "vim.h"
-char_u *default_vim_dir = (char_u *)"/system/usr/share/vim";
-char_u *default_vimruntime_dir = (char_u *)"/system/usr/share/vim";
+char_u *default_vim_dir = (char_u *)"/system_ext/usr/share/vim";
+char_u *default_vimruntime_dir = (char_u *)"/system_ext/usr/share/vim";
char_u *all_cflags = (char_u *)"gcc -c -I. -Iproto -DHAVE_CONFIG_H -g -O2 ";
char_u *all_lflags = (char_u *)"gcc -L/system/lib -o vim -lm -lselinux ";
char_u *compiled_user = (char_u *)"android";
diff --git a/vimrc.android b/vimrc.android
index 2f74488..9589475 100644
--- a/vimrc.android
+++ b/vimrc.android
@@ -102,7 +102,7 @@
endif
if has("syntax")
- source /system/usr/share/vim/autoload/spacehi.vim
+ source /system_ext/usr/share/vim/autoload/spacehi.vim
endif
" Convenient command to see the difference between the current buffer and the