diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..27f1e0b
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,223 @@
+prebuilt_etc {
+    name: "vimrc",
+    src: "vimrc.android",
+    system_ext_specific: true,
+}
+
+prebuilt_usr_share {
+    name: "vim-runtime-autoload-dist",
+    srcs: [
+        "runtime/autoload/dist/*",
+    ],
+    sub_dir: "vim/autoload/dist",
+    system_ext_specific: true,
+}
+
+prebuilt_usr_share {
+    name: "vim-runtime-autoload",
+    srcs: [
+        "runtime/autoload/spacehi.vim",
+    ],
+    sub_dir: "vim/autoload",
+    system_ext_specific: true,
+}
+
+prebuilt_usr_share {
+    name: "vim-runtime-colors",
+    srcs: [
+        "runtime/colors/*",
+    ],
+    sub_dir: "vim/colors",
+    system_ext_specific: true,
+}
+
+prebuilt_usr_share {
+    name: "vim-runtime-doc",
+    srcs: [
+        "runtime/doc/*",
+    ],
+    sub_dir: "vim/doc",
+    system_ext_specific: true,
+}
+
+prebuilt_usr_share {
+    name: "vim-runtime-plugin",
+    srcs: [
+        "runtime/plugin/matchparen.vim",
+    ],
+    sub_dir: "vim/plugin",
+    system_ext_specific: true,
+}
+
+prebuilt_usr_share {
+    name: "vim-runtime-syntax",
+    srcs: [
+        "runtime/syntax/*",
+    ],
+    sub_dir: "vim/syntax",
+    system_ext_specific: true,
+}
+
+prebuilt_usr_share {
+    name: "vim-runtime",
+    srcs: [
+        "runtime/defaults.vim",
+        "runtime/filetype.vim",
+        "runtime/ftoff.vim",
+        "runtime/indent.vim",
+        "runtime/indoff.vim",
+        "runtime/scripts.vim",
+    ],
+    sub_dir: "vim",
+    system_ext_specific: true,
+}
+
+cc_binary {
+    name: "vim",
+    srcs: [
+        "src/auto/pathdef.c",
+        "src/alloc.c",
+        "src/arabic.c",
+        "src/arglist.c",
+        "src/autocmd.c",
+        "src/beval.c",
+        "src/blob.c",
+        "src/blowfish.c",
+        "src/buffer.c",
+        "src/bufwrite.c",
+        "src/change.c",
+        "src/channel.c",
+        "src/charset.c",
+        "src/cindent.c",
+        "src/clientserver.c",
+        "src/clipboard.c",
+        "src/cmdexpand.c",
+        "src/cmdhist.c",
+        "src/crypt.c",
+        "src/crypt_zip.c",
+        "src/debugger.c",
+        "src/dict.c",
+        "src/diff.c",
+        "src/digraph.c",
+        "src/drawline.c",
+        "src/drawscreen.c",
+        "src/edit.c",
+        "src/evalbuffer.c",
+        "src/eval.c",
+        "src/evalfunc.c",
+        "src/evalvars.c",
+        "src/evalwindow.c",
+        "src/ex_cmds2.c",
+        "src/ex_cmds.c",
+        "src/ex_docmd.c",
+        "src/ex_eval.c",
+        "src/ex_getln.c",
+        "src/fileio.c",
+        "src/filepath.c",
+        "src/findfile.c",
+        "src/float.c",
+        "src/fold.c",
+        "src/getchar.c",
+        "src/hardcopy.c",
+        "src/hashtab.c",
+        "src/help.c",
+        "src/highlight.c",
+        "src/if_cscope.c",
+        "src/if_xcmdsrv.c",
+        "src/iid_ole.c",
+        "src/indent.c",
+        "src/insexpand.c",
+        "src/iscygpty.c",
+        "src/job.c",
+        "src/json.c",
+        "src/list.c",
+        "src/locale.c",
+        "src/main.c",
+        "src/map.c",
+        "src/mark.c",
+        "src/match.c",
+        "src/mbyte.c",
+        "src/memfile.c",
+        "src/memline.c",
+        "src/menu.c",
+        "src/message.c",
+        "src/misc1.c",
+        "src/misc2.c",
+        "src/mouse.c",
+        "src/move.c",
+        "src/nbdebug.c",
+        "src/netbeans.c",
+        "src/normal.c",
+        "src/ops.c",
+        "src/option.c",
+        "src/optionstr.c",
+        "src/os_unix.c",
+        "src/popupmenu.c",
+        "src/popupwin.c",
+        "src/profiler.c",
+        "src/pty.c",
+        "src/quickfix.c",
+        "src/regexp.c",
+        "src/register.c",
+        "src/screen.c",
+        "src/scriptfile.c",
+        "src/search.c",
+        "src/session.c",
+        "src/sha256.c",
+        "src/sign.c",
+        "src/sound.c",
+        "src/spell.c",
+        "src/spellfile.c",
+        "src/spellsuggest.c",
+        "src/strings.c",
+        "src/syntax.c",
+        "src/tag.c",
+        "src/term.c",
+        "src/terminal.c",
+        "src/testing.c",
+        "src/textformat.c",
+        "src/textobject.c",
+        "src/textprop.c",
+        "src/time.c",
+        "src/typval.c",
+        "src/ui.c",
+        "src/undo.c",
+        "src/usercmd.c",
+        "src/userfunc.c",
+        "src/version.c",
+        "src/vim9cmds.c",
+        "src/vim9compile.c",
+        "src/vim9execute.c",
+        "src/vim9expr.c",
+        "src/vim9instr.c",
+        "src/vim9script.c",
+        "src/vim9type.c",
+        "src/viminfo.c",
+        "src/window.c",
+    ],
+    cflags: [
+        "-DHAVE_CONFIG_H",
+        "-DSYS_VIMRC_FILE=\"/system_ext/etc/vimrc\"",
+    ],
+    local_include_dirs: [
+        "src/proto",
+        "src",
+    ],
+    shared_libs: [
+        "libselinux",
+        "libncurses",
+        "libm",
+        "libdl",
+    ],
+    required: [
+        "vimrc",
+        "vim-runtime-autoload-dist",
+        "vim-runtime-autoload",
+        "vim-runtime-colors",
+        "vim-runtime-doc",
+        "vim-runtime-plugin",
+        "vim-runtime-syntax",
+        "vim-runtime",
+    ],
+    system_ext_specific: true,
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 8b13062..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,221 +0,0 @@
-vim_src := $(call my-dir)
-
-# ========================================================
-# etc/vimrc
-# ========================================================
-
-LOCAL_PATH := $(vim_src)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vimrc
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := vimrc.android
-LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_EXT_ETC)
-
-include $(BUILD_PREBUILT)
-
-# ========================================================
-# vim
-# ========================================================
-
-LOCAL_PATH := $(vim_src)/src
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	auto/pathdef.c \
-	autocmd.c \
-	blob.c \
-	blowfish.c \
-	buffer.c \
-	change.c \
-	channel.c \
-	charset.c \
-	debugger.c \
-	dict.c \
-	diff.c \
-	digraph.c \
-	edit.c \
-	eval.c \
-	evalfunc.c \
-	ex_cmds.c \
-	ex_cmds2.c \
-	ex_docmd.c \
-	ex_eval.c \
-	ex_getln.c \
-	fileio.c \
-	findfile.c \
-	fold.c \
-	getchar.c \
-	hardcopy.c \
-	hashtab.c \
-	if_cscope.c \
-	if_xcmdsrv.c \
-	indent.c \
-	json.c \
-	list.c \
-	main.c \
-	mark.c \
-	mbyte.c \
-	memfile.c \
-	memline.c \
-	menu.c \
-	message.c \
-	misc1.c \
-	misc2.c \
-	move.c \
-	normal.c \
-	ops.c \
-	option.c \
-	os_unix.c \
-	popupmnu.c \
-	popupwin.c \
-	pty.c \
-	quickfix.c \
-	regexp.c \
-	screen.c \
-	search.c \
-	sha256.c \
-	spell.c \
-	syntax.c \
-	tag.c \
-	term.c \
-	textprop.c \
-	ui.c \
-	undo.c \
-	usercmd.c \
-	userfunc.c \
-	version.c \
-	window.c
-
-LOCAL_C_INCLUDES += \
-	external/libselinux/include \
-	external/libncurses/include \
-	$(LOCAL_PATH)/proto \
-	$(LOCAL_PATH)/auto
-
-LOCAL_SHARED_LIBRARIES += \
-	libselinux \
-	libncurses \
-	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_ext/etc/vimrc\"
-
-# vim variants: TINY SMALL CM NORMAL BIG HUGE
-#
-# NORMAL, BIG and HUGE are almost the same (1.1M)
-# TINY and SMALL are similar to busybox vi (460K)
-#
-# our profile is between SMALL and NORMAL (780K)
-# with syntax and utf8 (mbyte) support
-#
-# to reduce vim size, manually define wanted features
-LOCAL_CFLAGS += \
-	-DFEAT_SMALL=1 \
-	-DFEAT_MBYTE=1 \
-	-DFEAT_SYN_HL=1 \
-	-DFEAT_CINDENT=1 \
-	-DFEAT_COMMENTS=1 \
-	-DFEAT_EVAL=1 \
-	-DFEAT_AUTOCMD=1 \
-	-DFEAT_USR_CMDS=1 \
-	-DFEAT_EX_EXTRA=1 \
-	-DFEAT_CMDL_COMPL=1 \
-	-DFEAT_LISTCMDS=1 \
-	-DFEAT_CMDL_INFO=1 \
-	-DFEAT_SEARCH_EXTRA=1
-
-LOCAL_CFLAGS += -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations
-
-LOCAL_MODULE := vim
-LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_EXT_EXECUTABLES)
-LOCAL_REQUIRED_MODULES := vimrc
-include $(BUILD_EXECUTABLE)
-
-# Create vi symlink
-$(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
-# ========================================================
-ifeq (vim,$(filter vim, $(ALL_MODULES)))
-
-vim_runtime_path := $(vim_src)/runtime
-
-vim_runtime_files := \
-	scripts.vim \
-	indent.vim \
-	indoff.vim \
-	filetype.vim \
-	ftoff.vim
-
-vim_doc_files := \
-	help.txt intro.txt tags \
-	motion.txt editing.txt scroll.txt \
-	options.txt term.txt
-
-vim_colors_files := \
-	default.vim \
-	desert.vim
-
-vim_syntax_files := \
-	logcat.vim \
-	awk.vim \
-	config.vim \
-	conf.vim \
-	cpp.vim \
-	c.vim \
-	css.vim \
-	diff.vim \
-	doxygen.vim \
-	html.vim vb.vim \
-	xml.vim dtd.vim \
-	context.vim \
-	gitcommit.vim \
-	help.vim \
-	javascript.vim \
-	java.vim \
-	lua.vim \
-	manual.vim \
-	markdown.vim \
-	pod.vim \
-	sh.vim \
-	syncolor.vim \
-	synload.vim \
-	syntax.vim \
-	vim.vim
-
-vim_plugin_files := \
-	matchparen.vim \
-
-vim_autoload_files := \
-	dist/ft.vim \
-	spacehi.vim
-
-VIM_SHARED := $(TARGET_OUT_SYSTEM_EXT)/usr/share/vim
-
-RUNTIME_FILES := \
-  $(vim_runtime_files) \
-  $(addprefix doc/, $(vim_doc_files)) \
-  $(addprefix colors/, $(vim_colors_files)) \
-  $(addprefix syntax/, $(vim_syntax_files)) \
-  $(addprefix plugin/, $(vim_plugin_files)) \
-  $(addprefix autoload/, $(vim_autoload_files)) \
-
-$(VIM_SHARED): $(ACP)
-	@echo "Install vim runtime files" 
-	@mkdir -p $@
-	@$(foreach RUNTIME_FILE,$(RUNTIME_FILES), \
-		mkdir -p $@/$(dir $(RUNTIME_FILE)); \
-		$(ACP) $(vim_runtime_path)/$(RUNTIME_FILE) $@/$(RUNTIME_FILE); \
-	)
-
-ALL_DEFAULT_INSTALLED_MODULES += $(VIM_SHARED)
-
-endif