Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4188eca authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-22.2' into a15

parents 895221e4 5c642b8a

app/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -47,9 +47,11 @@ android_app { 
        "androidx-constraintlayout_constraintlayout",

        "androidx.core_core-ktx",

        "androidx.fragment_fragment-ktx",

        "androidx.graphics_graphics-shapes",

        "androidx.lifecycle_lifecycle-runtime",

        "androidx.lifecycle_lifecycle-runtime-ktx",

        "androidx.lifecycle_lifecycle-service",

        "androidx.lifecycle_lifecycle-viewmodel-savedstate",

        "Twelve_androidx.media3_media3-common-ktx",

        "Twelve_androidx.media3_media3-exoplayer",

        "Twelve_androidx.media3_media3-exoplayer-hls",
@@ -63,9 +65,10 @@ android_app { 
        "androidx.recyclerview_recyclerview",

        "androidx.room_room-ktx",

        "androidx.room_room-runtime",

        "androidx.savedstate_savedstate",

        "androidx.viewpager2_viewpager2",

        "Twelve_com.github.bogerchan_Nier-Visualizer",

        "Twelve_com.google.android.material_material",

        "com.google.android.material_material",

        "Twelve_com.squareup.okhttp3_okhttp",

        "Twelve_io.coil-kt.coil3_coil",

        "Twelve_io.coil-kt.coil3_coil-android",

app/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ configure<GenerateBpPluginExtension> { 
                !module.group.startsWith("androidx.media3")

            }

            module.group.startsWith("org.jetbrains") -> true

            module.group == "com.google.android.material" -> true

            module.group == "com.google.auto.value" -> true

            module.group == "com.google.code.findbugs" -> true

            module.group == "com.google.errorprone" -> true

app/libs/Android.bp

+13 −31
Original line number Diff line number Diff line
@@ -235,37 +235,6 @@ android_library_import { 
    ],

}



android_library_import {

    name: "Twelve_com.google.android.material_material",

    aars: ["com/google/android/material/material/1.12.0/material-1.12.0.aar"],

    sdk_version: "35",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "androidx-constraintlayout_constraintlayout",

        "androidx.activity_activity",

        "androidx.annotation_annotation",

        "androidx.annotation_annotation-experimental",

        "androidx.appcompat_appcompat",

        "androidx.cardview_cardview",

        "androidx.coordinatorlayout_coordinatorlayout",

        "androidx.core_core",

        "androidx.drawerlayout_drawerlayout",

        "androidx.dynamicanimation_dynamicanimation",

        "androidx.fragment_fragment",

        "androidx.lifecycle_lifecycle-runtime",

        "androidx.recyclerview_recyclerview",

        "androidx.resourceinspection_resourceinspection-annotation",

        "androidx.transition_transition",

        "androidx.vectordrawable_vectordrawable",

        "androidx.viewpager2_viewpager2",

        "error_prone_annotations",

    ],

}



java_import {

    name: "Twelve_com.squareup.okhttp3_okhttp",

    jars: ["com/squareup/okhttp3/okhttp/4.12.0/okhttp-4.12.0.jar"],
@@ -430,3 +399,16 @@ java_import { 
        "kotlin-stdlib",

    ],

}



java_import {

    name: "Twelve_org.jspecify_jspecify",

    jars: ["org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar"],

    sdk_version: "35",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

    ],

}

app/libs/com/google/android/material/material/1.12.0/material-1.12.0.aar

deleted100644 → 0
−2.22 MiB

File deleted.

View file

app/libs/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar

0 → 100644
+3.73 KiB

File added.

No diff preview for this file type.

View file