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

Commit 528cb81b authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Use androidx.window prebuilt." into tm-dev am: b42867b8 am: 4e1f1e24"

parents 35d888ff 9a14e1f6

packages/SettingsLib/ActivityEmbedding/Android.bp

+7 −1
Original line number Diff line number Diff line
@@ -15,9 +15,15 @@ android_library { 
    static_libs: [

        "androidx.annotation_annotation",

        "androidx.core_core",

        "windowExtLib",

        "androidx.window_window",

        "SettingsLibUtils",

    ],

    sdk_version: "system_current",

    min_sdk_version: "21",

    // TODO(b/228508619) Remove the optional uses after fixing upstream

    optional_uses_libs: [

        "org.apache.http.legacy",

        "androidx.window.extensions",

        "androidx.window.sidecar",

    ],

}

packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -20,4 +20,9 @@ 


    <uses-sdk android:minSdkVersion="21" />



    <application>

        <uses-library android:name="androidx.window.extensions" android:required="false" />

        <uses-library android:name="androidx.window.sidecar" android:required="false" />

    </application>



</manifest>