From a4156b6f4ddb04f267d5126e991aaeee65ebca06 Mon Sep 17 00:00:00 2001
From: Simon Wingrove <simonjw@google.com>
Date: Fri, 14 Oct 2022 11:45:56 +0100
Subject: [PATCH] Allow ActivityEmbedding in APEX modules.

Also this lib uses HTTP and doesn't declare it, so after manifest merge
the APEX module won't build.  Add the uses-library.

Bug: 253394518
Test: test builds
Change-Id: I94cb2be58d88521ed10e4fba5b5e11169bead624
---
 packages/SettingsLib/ActivityEmbedding/Android.bp          | 5 +++++
 packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml | 1 +
 2 files changed, 6 insertions(+)

diff --git a/packages/SettingsLib/ActivityEmbedding/Android.bp b/packages/SettingsLib/ActivityEmbedding/Android.bp
index 332bebffb6378..c35fb3b17880c 100644
--- 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",
+    ],
 }
diff --git a/packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml b/packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml
index 5ce08b7747a47..0f13f6498346e 100644
--- 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>