widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add uses-library for org.apache.http.legacy

Browse Source 
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
This commit is contained in:
Paul Duffin
2018-02-23 14:55:50 +00:00
parent aef1f6f48e
commit 00f28599b9
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libwvdrmengine/test/castv2/AndroidManifest.xml
View File

@@ -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">

2
libwvdrmengine/test/java/AndroidManifest.xml
View File

@@ -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">