Merge "Allow ActivityEmbedding in APEX modules." into tm-mainline-prod

2022-10-20 08:49:22 +00:00
parent 0f022bbf1d a4156b6f4d
commit b58553432a
2 changed files with 6 additions and 0 deletions
--- a/packages/SettingsLib/ActivityEmbedding/Android.bp
+++ b/packages/SettingsLib/ActivityEmbedding/Android.bp
@@ -26,4 +26,9 @@ android_library {
        "androidx.window.extensions",
        "androidx.window.sidecar",
    ],
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.permission",
+    ],
 }
--- a/packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml
+++ b/packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml
@@ -21,6 +21,7 @@
    <uses-sdk android:minSdkVersion="21" />

    <application>
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />
        <uses-library android:name="androidx.window.extensions" android:required="false" />
        <uses-library android:name="androidx.window.sidecar" android:required="false" />
    </application>