Let Kryon map the NDK's build-relative path for every Android app

Kryon's reproducible-path helper now maps the spelling Ninja uses for
native_app_glue, so Inbe drops its own copy of that mapping.
This commit is contained in:
waozi committed 2026-10-23 02:30:00 -03:00
1 parent e846d674d3
commit e5357e9f36
2 files changed
+14 -18

No files matched your search

-4
View File
@@ -26,10 +26,6 @@ set(SQLITE_AMALGAMATION_C "${SQLITE_BUILD_DIR}/sqlite3.c")
set(SQLITE_AMALGAMATION_H "${SQLITE_BUILD_DIR}/sqlite3.h")
include("${KRYON_DIR}/cmake/KryonAndroid.cmake")
kryon_android_reproducible_paths("${REPO_ROOT}")
# Ninja names the NDK's native_app_glue relative to the build directory, a
# spelling that carries both install locations. Newer Kryon maps it as well.
file(RELATIVE_PATH APP_NDK_FROM_BUILD "${CMAKE_BINARY_DIR}" "${ANDROID_NDK}")
add_compile_options("-ffile-prefix-map=${APP_NDK_FROM_BUILD}=./ndk")
# Apply the release size policy to static dependencies as well as the host.
add_compile_options("$<$<NOT:$<CONFIG:Debug>>:-Oz>")
set(OQS_BUILD_ONLY_LIB ON CACHE BOOL "" FORCE)
+14 -14
View File
@@ -28,7 +28,7 @@
},
{
"commit": "1cb9df183089a77c8a16448a556186f30b261a98",
"dependencies": {"kryon": "p443f6238630e97c6"},
"dependencies": {"kryon": "p4f746ed7fca2462f"},
"id": "p1b13dda539ed2a39",
"name": "Kss",
"ref": "master",
@@ -36,7 +36,7 @@
},
{
"commit": "bad2caaa84ef3eae61e40c99bf572d2b060d0ca2",
"dependencies": {"kryon": "p443f6238630e97c6"},
"dependencies": {"kryon": "p4f746ed7fca2462f"},
"id": "p20eb23d3e6db3711",
"name": "Game2D",
"ref": "master",
@@ -44,20 +44,12 @@
},
{
"commit": "622db7474127fc47432f3786b856e505c6645b3a",
"dependencies": {"crypto": "pf039d7a776333200", "kryon": "p443f6238630e97c6"},
"dependencies": {"crypto": "pf039d7a776333200", "kryon": "p4f746ed7fca2462f"},
"id": "p424eeb497051c0eb",
"name": "Apps",
"ref": "master",
"url": "https://github.com/waozixyz/apps.git"
},
{
"commit": "884bc1108d52d542406f53472ed8bb1ab3f06454",
"dependencies": {"raylib": "p5a77c9c35110e925"},
"id": "p443f6238630e97c6",
"name": "kryon",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "e1f480f382d9443c4412133b55948374c77a5c21",
"dependencies": {},
@@ -67,6 +59,14 @@
"source": true,
"url": "https://github.com/open-quantum-safe/liboqs.git"
},
{
"commit": "717fcce64f4d9f4f3bed001cb8a6cdd525e94014",
"dependencies": {"raylib": "p5a77c9c35110e925"},
"id": "p4f746ed7fca2462f",
"name": "kryon",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "fafa2cea97d0cb379d832086ba45a989fa6f9c8e",
"dependencies": {},
@@ -95,7 +95,7 @@
},
{
"commit": "efe0ac0d83ec9c2ecb15a20a320994ca6fc347d2",
"dependencies": {"daochi_client": "p0cff069893bdc938", "kryon": "p443f6238630e97c6", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"dependencies": {"daochi_client": "p0cff069893bdc938", "kryon": "p4f746ed7fca2462f", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"id": "pabca5e1965868141",
"name": "Entity",
"ref": "master",
@@ -120,7 +120,7 @@
},
{
"commit": "4b0e25bd2df86b54a8f5af3db48282bd41daab1a",
"dependencies": {"kryon": "p443f6238630e97c6"},
"dependencies": {"kryon": "p4f746ed7fca2462f"},
"id": "pe8e21a1f2b5ff52c",
"name": "plot",
"ref": "master",
@@ -145,7 +145,7 @@
}
],
"root": {
"dependencies": {"apps": "p424eeb497051c0eb", "crypto": "pf039d7a776333200", "curl": "pd4bcd11b7d623073", "daochi_client": "p0cff069893bdc938", "entity": "pabca5e1965868141", "game2d": "p20eb23d3e6db3711", "kryon": "p443f6238630e97c6", "kss": "p1b13dda539ed2a39", "liboqs": "p4b0a50b49959e674", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pe8e21a1f2b5ff52c", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "sqlite": "peaa43c4b7ef72edf"},
"dependencies": {"apps": "p424eeb497051c0eb", "crypto": "pf039d7a776333200", "curl": "pd4bcd11b7d623073", "daochi_client": "p0cff069893bdc938", "entity": "pabca5e1965868141", "game2d": "p20eb23d3e6db3711", "kryon": "p4f746ed7fca2462f", "kss": "p1b13dda539ed2a39", "liboqs": "p4b0a50b49959e674", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pe8e21a1f2b5ff52c", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "sqlite": "peaa43c4b7ef72edf"},
"name": "Inbe"
},
"toolchain": {