Merge "Add dependencies on org.apache.http.legacy where needed"
This commit is contained in:
committed by
Android (Google) Code Review
commit
cb0267404c
@@ -11,6 +11,7 @@
|
|||||||
<application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Holo.NoActionBar">
|
<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"
|
<uses-library android:name="com.android.mediadrm.signer"
|
||||||
android:required="true" />
|
android:required="true" />
|
||||||
|
<uses-library android:name="org.apache.http.legacy" android:required="false" />
|
||||||
<activity android:name="CastSignAPITest"
|
<activity android:name="CastSignAPITest"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:screenOrientation="landscape">
|
android:screenOrientation="landscape">
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
<uses-sdk android:minSdkVersion="12" />
|
<uses-sdk android:minSdkVersion="12" />
|
||||||
<application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Holo.NoActionBar">
|
<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" android:required="false" />
|
||||||
<activity android:name="MediaDrmAPITest"
|
<activity android:name="MediaDrmAPITest"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:screenOrientation="landscape">
|
android:screenOrientation="landscape">
|
||||||
|
|||||||
Reference in New Issue
Block a user