summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2025-12-16 23:43:08 +0800
committerruki <[email protected]>2025-12-16 23:43:08 +0800
commitdb1900b7a76b6bb59e3780d4377080ef74afa2d7 (patch)
tree01b1d70eea84cd62964d4e44d109e5d48e37bb3c
parent4efa9f8afc8982fb7ae2f388c9417ae97199ec0a (diff)
improve run and install
-rw-r--r--xmake/rules/ndk/install.lua4
-rw-r--r--xmake/rules/ndk/run.lua4
2 files changed, 4 insertions, 4 deletions
diff --git a/xmake/rules/ndk/install.lua b/xmake/rules/ndk/install.lua
index 672a623ce..0aa43e790 100644
--- a/xmake/rules/ndk/install.lua
+++ b/xmake/rules/ndk/install.lua
@@ -19,7 +19,6 @@
--
-- imports
-import("run", {alias = "run_app"})
-- main entry
function main(target)
@@ -33,7 +32,4 @@ function main(target)
cprint("installing %s ...", final_apk)
os.vrunv(adb, {"install", "-r", final_apk})
cprint("install ok")
-
- -- run it
- run_app(target)
end
diff --git a/xmake/rules/ndk/run.lua b/xmake/rules/ndk/run.lua
index 612d18c7e..b705498d1 100644
--- a/xmake/rules/ndk/run.lua
+++ b/xmake/rules/ndk/run.lua
@@ -20,10 +20,14 @@
-- imports
import("core.base.tty")
+import("install", {alias = "install_app"})
-- main entry
function main(target)
+ -- install it first
+ install_app(target)
+
local conf = target:extraconf("rules", "android.native_app")
local package_name = conf.package_name
local activity_name = conf.activity_name or "android.app.NativeActivity"