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

Declare explicit dependency org.apache.http.legacy.

Browse Source 
This is required because these makefiles contain a module that's
building agains the "current" SDK and will need to add an explicit
compile time dependency on the apache API.

Note that no runtime dependency is needed because the app targets
SDK version 12 (?!!).

bug: 18027885
Change-Id: I37587b91f9c52f88a8becce0449ac9b24a77fdad
This commit is contained in:
Narayan Kamath
2014-12-12 15:12:00 +00:00
parent a09f39bb63
commit fc2b694b4f
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/test/java/Android.mk
View File

@@ -7,8 +7,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := MediaDrmAPITest
# TODO: Uncomment this line when the MediaDrm APIs are unhidden
#LOCAL_SDK_VERSION := current
LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
# TODO: This test app depends on framework implementation details.
# LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE)

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

@@ -5,7 +5,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-sdk android:minSdkVersion="12"></uses-sdk>
<uses-sdk android:minSdkVersion="12" />
<application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Holo.NoActionBar">
<activity android:name="MediaDrmAPITest"
android:label="@string/app_name"

2
proprietary/samplePlayer/Android.mk
View File

@@ -7,6 +7,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := WidevineSamplePlayer
LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE)

2
proprietary/samplePlayer/AndroidManifest.xml
View File

@@ -5,7 +5,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-sdk android:minSdkVersion="12"></uses-sdk>
<uses-sdk android:minSdkVersion="12" android:targetSdkVersion="12" />
<application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Holo.NoActionBar">
<activity android:name=".WidevineSamplePlayer"
android:label="@string/app_name"