OpenDelta: Switch to blueprint

Signed-off-by: Jyotiraditya Panda <jyotiraditya@aospa.co>

Android.bp

@@ -0,0 +1,17 @@
+android_app {
+    name: "OpenDelta",
+    srcs: ["src/**/*.java"],
+    resource_dirs: ["res"],
+    static_libs: [
+        "androidx.core_core",
+        "androidx.cardview_cardview",
+        "androidx.preference_preference",
+    ],
+    privileged: true,
+    jni_libs: ["libopendelta"],
+    required: ["libopendelta"],
+    optimize: {
+        enabled: false,
+    },
+    platform_apis: true,
+}

Android.mk

@@ -1,28 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_STATIC_ANDROID_LIBRARIES := androidx.core_core \
-    androidx.cardview_cardview \
-    androidx.preference_preference
-
-LOCAL_PACKAGE_NAME := OpenDelta
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_USE_AAPT2 := true
-LOCAL_JNI_SHARED_LIBRARIES := libopendelta
-LOCAL_REQUIRED_MODULES := libopendelta
-LOCAL_PROGUARD_ENABLED := disabled
-
-ifneq (,$(wildcard frameworks/base))
-  LOCAL_PRIVATE_PLATFORM_APIS := true
-else
-  LOCAL_SDK_VERSION := system_current
-endif
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))

jni/Android.bp

@@ -0,0 +1,54 @@
+cc_library_shared {
+    name: "libopendelta",
+    cflags: [
+        "-Ofast",
+        "-Wno-unused-parameter",
+        "-Wno-unused-function",
+        "-Wno-sign-compare",
+    ],
+    srcs: [
+        "xdelta3-3.0.7/xdelta3.c",
+        "zipadjust.c",
+        "delta.c",
+        "delta_jni.c",
+    ],
+    host_ldlibs: ["-lz"],
+    include_dirs: ["external/zlib"],
+    shared_libs: ["libz"],
+}
+
+cc_binary {
+    name: "dedelta",
+    cflags: [
+        "-Ofast",
+        "-Wno-unused-parameter",
+        "-Wno-unused-function",
+        "-Wno-sign-compare",
+    ],
+    srcs: [
+        "xdelta3-3.0.7/xdelta3.c",
+        "delta.c",
+        "delta_run.c",
+    ],
+    host_ldlibs: ["-lz"],
+
+    include_dirs: ["external/zlib"],
+    shared_libs: ["libz"],
+}
+
+cc_binary {
+    name: "zipadjust",
+    cflags: [
+        "-Ofast",
+        "-Wno-unused-parameter",
+        "-Wno-unused-function",
+        "-Wno-sign-compare",
+    ],
+    srcs: [
+        "zipadjust.c",
+        "zipadjust_run.c",
+    ],
+    host_ldlibs: ["-lz"],
+    include_dirs: ["external/zlib"],
+    shared_libs: ["libz"],
+}

jni/Android.mk

@@ -1,39 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += -Ofast -Wno-unused-parameter -Wno-unused-function -Wno-sign-compare
-LOCAL_MODULE := libopendelta
-LOCAL_SRC_FILES += xdelta3-3.0.7/xdelta3.c zipadjust.c delta.c delta_jni.c
-LOCAL_LDLIBS := -lz
-
-LOCAL_C_INCLUDES += external/zlib
-LOCAL_SHARED_LIBRARIES := libz
-
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += -Ofast -Wno-unused-parameter -Wno-unused-function -Wno-sign-compare
-LOCAL_MODULE := dedelta
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES += xdelta3-3.0.7/xdelta3.c delta.c delta_run.c
-LOCAL_LDLIBS := -lz
-
-LOCAL_C_INCLUDES += external/zlib
-LOCAL_SHARED_LIBRARIES := libz
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += -Ofast -Wno-unused-parameter -Wno-unused-function -Wno-sign-compare
-LOCAL_MODULE := zipadjust
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES += zipadjust.c zipadjust_run.c
-LOCAL_LDLIBS := -lz
-
-LOCAL_C_INCLUDES += external/zlib
-LOCAL_SHARED_LIBRARIES := libz
-
-include $(BUILD_EXECUTABLE)