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

javalib.jar -> classes.jar for the stubs included in SDK

Browse Source 
I6730e2d3ec38004874265b2a690442dec57b33f4 made it clear that we should
depend on classes.jar for static java libraries. However, due to the
existing references to javalib.jar, the build system has been copied
classes.jar to javalib.jar.

But, this is not the case for Soong-defined java libraries. Instead of
doing the same thing for Soong-defined modules, directly fixing the
case where javalib.jar is being referenced.

Test: m -j dist
Merged-In: Ib1fb4ebdbdde42dec1028160a5473c645913d258
Change-Id: Ib1fb4ebdbdde42dec1028160a5473c645913d258
This commit is contained in:
Jiyong Park
2018-03-23 18:30:33 +09:00
parent e43dd95e8f
commit 285f698e63
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/sdk.atree
View File

@@ -157,13 +157,13 @@ ${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 ${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android-stubs-src.jar platforms/${PLATFORM_NAME}/android-stubs-src.jar
# optional API files. # optional API files.
development/build/optional.json platforms/${PLATFORM_NAME}/optional/optional.json development/build/optional.json platforms/${PLATFORM_NAME}/optional/optional.json
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/javalib.jar platforms/${PLATFORM_NAME}/optional/org.apache.http.legacy.jar ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/org.apache.http.legacy.jar
# deprecated APIs # deprecated APIs
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar platforms/${PLATFORM_NAME}/uiautomator.jar ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/classes.jar platforms/${PLATFORM_NAME}/uiautomator.jar
# Test APIs # Test APIs
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/javalib.jar platforms/${PLATFORM_NAME}/optional/android.test.mock.jar ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/android.test.mock.jar
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.test.base.stubs_intermediates/javalib.jar platforms/${PLATFORM_NAME}/optional/android.test.base.jar ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.test.base.stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/android.test.base.jar
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.test.runner.stubs_intermediates/javalib.jar platforms/${PLATFORM_NAME}/optional/android.test.runner.jar ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.test.runner.stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/android.test.runner.jar
# the aidl precompiled include # the aidl precompiled include
obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl