From fc2b694b4f5cb1310a66a2dc0f19348851703ae8 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Fri, 12 Dec 2014 15:12:00 +0000 Subject: [PATCH] Declare explicit dependency org.apache.http.legacy. 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 --- libwvdrmengine/test/java/Android.mk | 6 ++++-- libwvdrmengine/test/java/AndroidManifest.xml | 2 +- proprietary/samplePlayer/Android.mk | 2 ++ proprietary/samplePlayer/AndroidManifest.xml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libwvdrmengine/test/java/Android.mk b/libwvdrmengine/test/java/Android.mk index b8d5e7fe..4fed10e3 100644 --- a/libwvdrmengine/test/java/Android.mk +++ b/libwvdrmengine/test/java/Android.mk @@ -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) diff --git a/libwvdrmengine/test/java/AndroidManifest.xml b/libwvdrmengine/test/java/AndroidManifest.xml index 9d27677e..eff32480 100644 --- a/libwvdrmengine/test/java/AndroidManifest.xml +++ b/libwvdrmengine/test/java/AndroidManifest.xml @@ -5,7 +5,7 @@ - + - +