android: keep only xposed flavor

also changed Build.ID check to startsWith("CP1A")

Author: kavishdevar

android/app/build.gradle.kts

@@ -28,9 +28,8 @@ android {
 
     defaultConfig {
         applicationId = "me.kavishdevar.librepods"
-        minSdk = 33
         targetSdk = 37
-        versionCode = 50
+        versionCode = 52
         versionName = appVersionName
     }
     buildTypes {
@@ -47,21 +46,29 @@ android {
             }
             buildConfigField("Boolean", "PLAY_BUILD", "false")
             signingConfig = signingConfigs.getByName("release")
+            defaultConfig {
+                minSdk = 33
+            }
         }
         debug {
             buildConfigField("Boolean", "PLAY_BUILD", "false")
             signingConfig = signingConfigs.getByName("release")
             versionNameSuffix = "-debug"
+            defaultConfig {
+                minSdk = 33
+            }
         }
-        create("playRelease") {
-            initWith(getByName("release"))
-            buildConfigField("Boolean", "PLAY_BUILD", "true")
-            versionNameSuffix = "-play"
+    }
+    productFlavors {
+        create("foss") {
+            dimension = "env"
+            buildConfigField("Boolean", "PLAY_BUILD", "false")
         }
-        create("playDebug") {
-            initWith(getByName("debug"))
+        create("play") {
+            dimension = "env"
             buildConfigField("Boolean", "PLAY_BUILD", "true")
-            versionNameSuffix = "-youshouldnothavethis"
+            versionNameSuffix = "-play"
+            minSdk = 36
         }
     }
     compileOptions {
@@ -91,25 +98,6 @@ android {
     ndkVersion = "30.0.14904198"
 
     flavorDimensions += "env"
-
-    productFlavors {
-        create("normal") {
-            dimension = "env"
-            externalNativeBuild {
-                cmake {
-                    arguments += "-DIS_XPOSED=OFF"
-                }
-            }
-        }
-        create("xposed") {
-            dimension = "env"
-            externalNativeBuild {
-                cmake {
-                    arguments += "-DIS_XPOSED=ON"
-                }
-            }
-        }
-    }
 }
 
 dependencies {
@@ -139,9 +127,10 @@ dependencies {
     implementation(libs.backdrop)
 //    implementation(libs.hilt)
 //    implementation(libs.hilt.compiler)
-    add("xposedCompileOnly", libs.libxposed.api)
-    add("xposedImplementation", libs.libxposed.service)
-    add("playReleaseImplementation", libs.billing)
+    compileOnly(libs.libxposed.api)
+    implementation(libs.libxposed.service)
+    implementation(libs.play.review)
+    implementation(libs.play.review.ktx)
 }
 
 aboutLibraries {
@@ -184,14 +173,14 @@ fun registerRootModuleZipTask(
 }
 
 val zipRelease = registerRootModuleZipTask(
-    "zipXposedReleaseModule",
-    "xposed",
+    "zipReleaseModule",
+    "foss",
     "release"
 )
 
 val zipDebug = registerRootModuleZipTask(
-    "zipXposedDebugModule",
-    "xposed",
+    "zipDebugModule",
+    "foss",
     "debug"
 )
 
@@ -200,22 +189,22 @@ val collect = tasks.register<Copy>("collectReleaseArtifacts") {
     dependsOn(
         zipRelease,
         zipDebug,
-        "bundleXposedPlayRelease"
+        "bundlePlayRelease"
     )
 
     into(releaseDir)
 
-    from(layout.buildDirectory.dir("outputs/apk/xposed/release")) {
+    from(layout.buildDirectory.dir("outputs/apk/foss/release")) {
         include("*.apk")
         rename(".*", "LibrePods-FOSS-v$appVersionName-release.apk")
     }
 
-    from(layout.buildDirectory.dir("outputs/apk/xposed/debug")) {
+    from(layout.buildDirectory.dir("outputs/apk/foss/debug")) {
         include("*.apk")
         rename(".*", "LibrePods-FOSS-v$appVersionName-debug.apk")
     }
 
-    from(layout.buildDirectory.dir("outputs/bundle/xposedPlayRelease")) {
+    from(layout.buildDirectory.dir("outputs/bundle/playRelease")) {
         include("*.aab")
     }
 

android/app/src/main/cpp/CMakeLists.txt

@@ -3,8 +3,6 @@ cmake_minimum_required(VERSION 3.22.1)
 project("l2c_fcr_hook")
 set(CMAKE_CXX_STANDARD 23)
 
-option(IS_XPOSED "Build Xposed components" OFF)
-
 add_library(bluetooth_socket SHARED
         bluetooth_socket.cpp
 )
@@ -24,40 +22,36 @@ target_link_libraries(bluetooth_socket
         log
 )
 
-if(IS_XPOSED)
-
-    set(XPOSED_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../xposed/cpp)
 
-    add_library(l2c_fcr_hook SHARED
-            ${XPOSED_SRC_DIR}/l2c_fcr_hook.cpp
+set(XPOSED_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../xposed/cpp)
 
-            ${XPOSED_SRC_DIR}/xz/xz_crc32.c
-            ${XPOSED_SRC_DIR}/xz/xz_crc64.c
-            ${XPOSED_SRC_DIR}/xz/xz_sha256.c
-            ${XPOSED_SRC_DIR}/xz/xz_dec_stream.c
-            ${XPOSED_SRC_DIR}/xz/xz_dec_lzma2.c
-            ${XPOSED_SRC_DIR}/xz/xz_dec_bcj.c
-    )
+add_library(l2c_fcr_hook SHARED
+        l2c_fcr_hook.cpp
 
-    target_include_directories(l2c_fcr_hook PRIVATE
-            ${XPOSED_SRC_DIR}
-            ${XPOSED_SRC_DIR}/xz
-    )
+        xz/xz_crc32.c
+        xz/xz_crc64.c
+        xz/xz_sha256.c
+        xz/xz_dec_stream.c
+        xz/xz_dec_lzma2.c
+        xz/xz_dec_bcj.c
+)
 
-    target_compile_definitions(l2c_fcr_hook PRIVATE
-            XZ_DEC_X86
-            XZ_DEC_ARM
-            XZ_DEC_ARMTHUMB
-            XZ_DEC_ARM64
-            XZ_DEC_ANY_CHECK
-            XZ_USE_CRC64
-            XZ_USE_SHA256
-            XZ_DEC_CONCATENATED
-    )
+target_include_directories(l2c_fcr_hook PRIVATE
+        xz
+)
 
-    target_link_libraries(l2c_fcr_hook
-            android
-            log
-    )
+target_compile_definitions(l2c_fcr_hook PRIVATE
+        XZ_DEC_X86
+        XZ_DEC_ARM
+        XZ_DEC_ARMTHUMB
+        XZ_DEC_ARM64
+        XZ_DEC_ANY_CHECK
+        XZ_USE_CRC64
+        XZ_USE_SHA256
+        XZ_DEC_CONCATENATED
+)
 
-endif()
+target_link_libraries(l2c_fcr_hook
+        android
+        log
+)