Merge "Add an explicit dependency on org.apache.http.legacy."
This commit is contained in:
committed by
Android (Google) Code Review
commit
82ac77349d
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
|
|||||||
|
|
||||||
LOCAL_MODULE_TAGS := eng
|
LOCAL_MODULE_TAGS := eng
|
||||||
|
|
||||||
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
|
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common org.apache.http.legacy
|
||||||
|
|
||||||
LOCAL_SRC_FILES := $(call all-subdir-java-files) \
|
LOCAL_SRC_FILES := $(call all-subdir-java-files) \
|
||||||
src/com/android/development/IRemoteService.aidl \
|
src/com/android/development/IRemoteService.aidl \
|
||||||
|
|||||||
@@ -47,6 +47,7 @@
|
|||||||
|
|
||||||
<application android:label="Dev Tools"
|
<application android:label="Dev Tools"
|
||||||
android:icon="@mipmap/ic_launcher_devtools">
|
android:icon="@mipmap/ic_launcher_devtools">
|
||||||
|
<uses-library android:name="org.apache.http.legacy" android:required="false" />
|
||||||
|
|
||||||
<uses-library android:name="android.test.runner" />
|
<uses-library android:name="android.test.runner" />
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user