From 285f698e6309f8049f239c3d6074bcf4b7d28d60 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 23 Mar 2018 18:30:33 +0900 Subject: [PATCH] javalib.jar -> classes.jar for the stubs included in SDK 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 --- build/sdk.atree | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/sdk.atree b/build/sdk.atree index c4a42cdff..e7458f346 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -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 # 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/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 -${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 -${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.base.stubs_intermediates/javalib.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.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/classes.jar platforms/${PLATFORM_NAME}/optional/android.test.base.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 obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl