From 00f28599b93ed1c5372ddf8f04465655afffec62 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Fri, 23 Feb 2018 14:55:50 +0000
Subject: [PATCH] Add uses-library for org.apache.http.legacy

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* libwvdrmengine/test/castv2/AndroidManifest.xml
    Add uses-library for org.apache.http.legacy because CastSignAPITest
    depends on org.apache.http.legacy library at build time so
    presumably needs it to be provided at runtime. Unfortunately,
    CastSignAPITest targets P and from P onwards the
    org.apache.http.legacy library is only provided when explicitly
    requested through the manifest.

* libwvdrmengine/test/java/AndroidManifest.xml
    Add uses-library for org.apache.http.legacy because MediaDrmAPITest
    depends on org.apache.http.legacy library at build time so
    presumably needs it to be provided at runtime. Unfortunately,
    MediaDrmAPITest targets P and from P onwards the
    org.apache.http.legacy library is only provided when explicitly
    requested through the manifest.

Bug: 72375096
Bug: 18027885
Test:  make checkbuild
Change-Id: I3a761a693918fd506ace26fd7c3502a2a42c031d
---
 libwvdrmengine/test/castv2/AndroidManifest.xml | 1 +
 libwvdrmengine/test/java/AndroidManifest.xml   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/libwvdrmengine/test/castv2/AndroidManifest.xml b/libwvdrmengine/test/castv2/AndroidManifest.xml
index 67d6dec4..785f5205 100644
--- a/libwvdrmengine/test/castv2/AndroidManifest.xml
+++ b/libwvdrmengine/test/castv2/AndroidManifest.xml
@@ -11,6 +11,7 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Holo.NoActionBar">
       <uses-library android:name="com.android.mediadrm.signer"
                 android:required="true" />
+      <uses-library android:name="org.apache.http.legacy" />
       <activity android:name="CastSignAPITest"
                 android:label="@string/app_name"
                 android:screenOrientation="landscape">
diff --git a/libwvdrmengine/test/java/AndroidManifest.xml b/libwvdrmengine/test/java/AndroidManifest.xml
index eff32480..f08052f2 100644
--- a/libwvdrmengine/test/java/AndroidManifest.xml
+++ b/libwvdrmengine/test/java/AndroidManifest.xml
@@ -7,6 +7,8 @@
 
     <uses-sdk android:minSdkVersion="12" />
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Holo.NoActionBar">
+        <uses-library android:name="org.apache.http.legacy" />
+
         <activity android:name="MediaDrmAPITest"
                   android:label="@string/app_name"
                   android:screenOrientation="landscape">