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

Commit 3528b806 authored by Tsung-Mao Fang's avatar Tsung-Mao Fang Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17646212



Change-Id: If0137640a2b7831d87bc1e207f4d3e81235c669d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e81e5220 b42867b8

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>