LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stubs lib for org.apache.http.legacy is changed to -.stubs.

Browse Source 
Stubs lib for the sdk library org.apache.http.legacy is renamed to
org.apache.http.legacy.stubs, because the lib is now built using the
standardized build script 'java_sdk_library' where stubs libs are
suffixed with .stubs.

Bug: 77577799
Test: m -j
Merged-In: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
Change-Id: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
(cherry picked from commit 5579c00e56)
This commit is contained in:
Jiyong Park
2018-05-02 20:44:00 +09:00
parent 0d3f7dc99a
commit d06181a427
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/Android.mk
View File

@@ -85,7 +85,7 @@ ALL_SDK_FILES += $(android_jar_src_target)
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiautomator_intermediates/classes.jar
# org.apache.http.legacy.jar stubs
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/classes.jar
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy.stubs_intermediates/classes.jar
# test stubs
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/classes.jar

2
build/sdk.atree
View File

@@ -161,7 +161,7 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar
${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android-stubs-src.jar platforms/${PLATFORM_NAME}/android-stubs-src.jar
# optional API files.
development/build/optional.json platforms/${PLATFORM_NAME}/optional/optional.json
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/org.apache.http.legacy.jar
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/org.apache.http.legacy.stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/org.apache.http.legacy.jar
# deprecated APIs
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/classes.jar platforms/${PLATFORM_NAME}/uiautomator.jar
# Test APIs