From 1518711953488956e781a37b59d7ee5167929c23 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sun, 8 Mar 2026 14:31:25 -0400 Subject: [PATCH 1/3] WIP --- .gitmodules | 3 +++ libs/lpac-jni/src/main/jni/cjson/cjson | 1 + libs/lpac-jni/src/main/jni/lpac | 2 +- libs/lpac-jni/src/main/jni/lpac-jni.mk | 9 ++++++--- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 160000 libs/lpac-jni/src/main/jni/cjson/cjson diff --git a/.gitmodules b/.gitmodules index 863f1850..5af1da8a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "libs/lpac-jni/src/main/jni/lpac"] path = libs/lpac-jni/src/main/jni/lpac url = https://github.com/estkme-group/lpac.git +[submodule "libs/lpac-jni/src/main/jni/cJSON"] + path = libs/lpac-jni/src/main/jni/cjson/cjson + url = https://github.com/DaveGamble/cJSON diff --git a/libs/lpac-jni/src/main/jni/cjson/cjson b/libs/lpac-jni/src/main/jni/cjson/cjson new file mode 160000 index 00000000..c859b25d --- /dev/null +++ b/libs/lpac-jni/src/main/jni/cjson/cjson @@ -0,0 +1 @@ +Subproject commit c859b25da02955fef659d658b8f324b5cde87be3 diff --git a/libs/lpac-jni/src/main/jni/lpac b/libs/lpac-jni/src/main/jni/lpac index 90f71048..d214738f 160000 --- a/libs/lpac-jni/src/main/jni/lpac +++ b/libs/lpac-jni/src/main/jni/lpac @@ -1 +1 @@ -Subproject commit 90f7104847d4bb392b275746da20a55177a67573 +Subproject commit d214738fa0bdb23faf5833d3d798963079a00468 diff --git a/libs/lpac-jni/src/main/jni/lpac-jni.mk b/libs/lpac-jni/src/main/jni/lpac-jni.mk index dad173c3..20eea724 100644 --- a/libs/lpac-jni/src/main/jni/lpac-jni.mk +++ b/libs/lpac-jni/src/main/jni/lpac-jni.mk @@ -12,7 +12,8 @@ include $(CLEAR_VARS) # libcjson LOCAL_MODULE := lpac-cjson LOCAL_SRC_FILES := \ - $(call all-c-files-under, lpac/cjson) + $(call all-c-files-under, cjson/cjson) \ + $(call all-c-files-under, lpac/cjson-ext) include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -20,7 +21,9 @@ include $(CLEAR_VARS) LOCAL_MODULE := lpac-euicc LOCAL_STATIC_LIBRARIES := lpac-cjson LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/lpac + $(LOCAL_PATH)/lpac \ + $(LOCAL_PATH)/lpac/cjson-ext \ + $(LOCAL_PATH)/cjson \ LOCAL_SRC_FILES := \ $(call all-c-files-under, lpac/euicc) include $(BUILD_STATIC_LIBRARY) @@ -32,4 +35,4 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/lpac LOCAL_SRC_FILES := \ $(call all-c-files-under, lpac-jni) -include $(BUILD_SHARED_LIBRARY) \ No newline at end of file +include $(BUILD_SHARED_LIBRARY) -- 2.52.0 From 1513ead49cd5c580f65b9ca895d8e1502057ab24 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sun, 8 Mar 2026 14:35:46 -0400 Subject: [PATCH 2/3] Fix build --- libs/lpac-jni/src/main/jni/lpac-jni.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/lpac-jni/src/main/jni/lpac-jni.mk b/libs/lpac-jni/src/main/jni/lpac-jni.mk index 20eea724..98e5cd2a 100644 --- a/libs/lpac-jni/src/main/jni/lpac-jni.mk +++ b/libs/lpac-jni/src/main/jni/lpac-jni.mk @@ -11,9 +11,11 @@ endef include $(CLEAR_VARS) # libcjson LOCAL_MODULE := lpac-cjson +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/cjson LOCAL_SRC_FILES := \ $(call all-c-files-under, cjson/cjson) \ - $(call all-c-files-under, lpac/cjson-ext) + $(call all-c-files-under, lpac/cjson-ext/cjson-ext) include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -23,7 +25,7 @@ LOCAL_STATIC_LIBRARIES := lpac-cjson LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/lpac \ $(LOCAL_PATH)/lpac/cjson-ext \ - $(LOCAL_PATH)/cjson \ + $(LOCAL_PATH)/cjson LOCAL_SRC_FILES := \ $(call all-c-files-under, lpac/euicc) include $(BUILD_STATIC_LIBRARY) -- 2.52.0 From 61f2be37a82c5f214a669d5ea94d607fe9b6eab1 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sun, 8 Mar 2026 14:44:37 -0400 Subject: [PATCH 3/3] Hopefully Android.bp works too? --- libs/lpac-jni/src/main/jni/Android.bp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/lpac-jni/src/main/jni/Android.bp b/libs/lpac-jni/src/main/jni/Android.bp index ce622de5..bd5abd7b 100644 --- a/libs/lpac-jni/src/main/jni/Android.bp +++ b/libs/lpac-jni/src/main/jni/Android.bp @@ -1,6 +1,10 @@ cc_defaults { name: "lpac-jni-defaults", - local_include_dirs: ["lpac"], + local_include_dirs: [ + "cjson", + "lpac", + "lpac/cjson-ext", + ], sdk_version: "current", cflags: ["-Wno-error"], } @@ -9,7 +13,8 @@ cc_library_static { name: "liblpac-cjson", defaults: ["lpac-jni-defaults"], srcs: [ - "lpac/cjson/*.c", + "cjson/cjson/*.c", + "lpac/cjson-ext/cjson-ext/*.c", ], } -- 2.52.0