pmt: initial 2.8.0 update

build/others/makefile.androidmk

@@ -15,84 +15,50 @@
 # limitations under the License.
 
 ########
-# 2.7.0
+# 2.8.0
 ########
 
 LOCAL_PATH := $(call my-dir)
 
 include $(LOCAL_PATH)/../build/config/env.mk
 
-PMT_CFLAGS = \
+PMT_CXXFLAGS = \
     -O3 \
-    -std=c11 \
-    -pedantic \
+    -std=c++20 \
     -Wall \
     -Wextra \
     -Werror \
+    -Wno-vla-cxx-extension \
+    -Wno-nullability-completeness \
+    -Wno-writable-strings \
+    -Wno-unused-parameter \
+    -Wno-unused-command-line-argument \
     -Wno-nullability-extension \
+    -Wno-reorder-init-list \
     -Wno-gnu-zero-variadic-macro-arguments \
     -D__NDK_BUILD \
-    $(EXTRA_COMPILER_FLAGS)
+    $(PMT_EXTRA_CXXFLAGS)
 
 ifneq ($(PMT_ENABLE_DEBUG),)
-    PMT_CFLAGS += -gdwarf-5 -fsanitize=address -fsanitize=undefined
+    PMT_CXXFLAGS += -gdwarf-5 -fsanitize=address
 endif
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libpmt_root
-LOCAL_SRC_FILES := root.c
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
-LOCAL_CFLAGS := $(PMT_CFLAGS)
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libpmt_debug
-LOCAL_SRC_FILES := debug.c
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
-LOCAL_CFLAGS := $(PMT_CFLAGS)
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libpmt_partitiontool
-LOCAL_SRC_FILES := partitiontool.c
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
-LOCAL_CFLAGS := $(PMT_CFLAGS)
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libpmt_list
-LOCAL_SRC_FILES := listpart.c
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
-LOCAL_CFLAGS := $(PMT_CFLAGS)
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
 LOCAL_MODULE := pmt
 LOCAL_SRC_FILES := \
-    pmt.c \
-    version.c \
-    get_stat.c \
-    tools.c \
-    lang_tools.c \
-    languages.c \
-    help.c
+    Debug.cpp \
+    Root.cpp \
+    PartitionManager.cpp \
+    PartitionTool.cpp \
+    ListPartitions.cpp \
+    Version.cpp \
+    GetState.cpp \
+    Tools.cpp \
+    LanguageTools.cpp \
+    Languages.cpp \
+    Help.cpp
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
-LOCAL_STATIC_LIBRARIES := \
-    libpmt_root \
-    libpmt_debug \
-    libpmt_partitiontool \
-    libpmt_list
-LOCAL_CFLAGS := $(PMT_CFLAGS)
+LOCAL_CFLAGS := $(PMT_CXXFLAGS)
 
 include $(BUILD_EXECUTABLE)
-
-# end