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

Commit 668aea9b authored by Diego Vela's avatar Diego Vela Committed by Tsung-Mao Fang
Browse files

Use androidx.window from prebuilt. 

Use androidx.window prebuilt for consistency.

Bug: 223114509
Test: m -j

Change-Id: Ifeba7d0073ba7aeb6308c186738161c4857a97a3
parent b18b1063

Android.bp

+1 −10
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ android_library { 
        "androidx.cardview_cardview",

        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "androidx.window_window",

        "com.google.android.material_material",

        "setupcompat",

        "setupdesign",
@@ -75,7 +76,6 @@ android_library { 
        "android.hardware.dumpstate-V1.1-java",

        "lottie",

        "WifiTrackerLib",

        "windowExtLib",

        "SettingsLibActivityEmbedding",

    ],
@@ -105,10 +105,6 @@ android_app { 
    ],

    static_libs: ["Settings-core"],

    uses_libs: ["org.apache.http.legacy"],

    optional_uses_libs: [

        "androidx.window.extensions",

        "androidx.window.sidecar",

    ],

    resource_dirs: [],

    optimize: {

        proguard_flags_files: ["proguard.flags"],
@@ -120,11 +116,6 @@ android_library_import { 
    aars: ["libs/contextualcards.aar"],

}



android_library_import {

    name: "windowExtLib",

    aars: ["libs/window_ext_lib.aar"],

}



filegroup {

    name: "Settings_proguard_flags",

    srcs: ["proguard.flags"],

libs/window_ext_lib.aar

deleted100644 → 0
−159 KiB

File deleted.

View file

tests/robotests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ android_app { 
        "androidx.cardview_cardview",

        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "androidx.window_window",

        "com.google.android.material_material",

        "setupcompat",

        "setupdesign",
@@ -50,7 +51,6 @@ android_app { 
        "contextualcards",

        "settings-logtags",

        "zxing-core-1.7",

        "windowExtLib",

    ],



    aaptflags: ["--extra-packages com.android.settings"],