lpac-jni: Upgrade lpac (#315)

Upstream no longer bundles cjson so we pull it in ourselves. Android.bp is also updated for AOSP builds.

Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/315

.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

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",
     ],
 }
 

libs/lpac-jni/src/main/jni/cjson/cjson

@@ -0,0 +1 @@
+Subproject commit c859b25da02955fef659d658b8f324b5cde87be3

libs/lpac-jni/src/main/jni/lpac

@@ -1 +1 @@
-Subproject commit 90f7104847d4bb392b275746da20a55177a67573
+Subproject commit d214738fa0bdb23faf5833d3d798963079a00468

libs/lpac-jni/src/main/jni/lpac-jni.mk

@@ -11,8 +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, lpac/cjson)
+  $(call all-c-files-under, cjson/cjson) \
+	$(call all-c-files-under, lpac/cjson-ext/cjson-ext)
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -20,7 +23,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 +37,4 @@ LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/lpac
 LOCAL_SRC_FILES := \
 	$(call all-c-files-under, lpac-jni)
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)