diff options
Diffstat (limited to 'core/pdk_config.mk')
| -rw-r--r-- | core/pdk_config.mk | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/core/pdk_config.mk b/core/pdk_config.mk index 838754f..262b50e 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -52,18 +52,20 @@ ifneq (,$(filter platform-java, $(MAKECMDGOALS))$(PDK_FUSION_PLATFORM_ZIP)) # For these dirs, add classes.jar and javalib.jar from the dir to platform.zip # all paths under out dir PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \ - target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates \ - target/common/obj/JAVA_LIBRARIES/core-libart_intermediates \ - target/common/obj/JAVA_LIBRARIES/core-junit_intermediates \ - target/common/obj/JAVA_LIBRARIES/ext_intermediates \ - target/common/obj/JAVA_LIBRARIES/framework_intermediates \ - target/common/obj/JAVA_LIBRARIES/android.test.runner_intermediates \ - target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates \ - target/common/obj/JAVA_LIBRARIES/voip-common_intermediates \ - target/common/obj/JAVA_LIBRARIES/ims-common_intermediates \ - target/common/obj/JAVA_LIBRARIES/mms-common_intermediates \ - target/common/obj/JAVA_LIBRARIES/android-ex-camera2_intermediates \ - target/common/obj/JAVA_LIBRARIES/android-common_intermediates \ + target/common/obj/JAVA_LIBRARIES/android.test.runner_intermediates \ + target/common/obj/JAVA_LIBRARIES/android-common_intermediates \ + target/common/obj/JAVA_LIBRARIES/android-ex-camera2_intermediates \ + target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates \ + target/common/obj/JAVA_LIBRARIES/bouncycastle_intermediates \ + target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates \ + target/common/obj/JAVA_LIBRARIES/core-libart_intermediates \ + target/common/obj/JAVA_LIBRARIES/core-junit_intermediates \ + target/common/obj/JAVA_LIBRARIES/ext_intermediates \ + target/common/obj/JAVA_LIBRARIES/framework_intermediates \ + target/common/obj/JAVA_LIBRARIES/ims-common_intermediates \ + target/common/obj/JAVA_LIBRARIES/okhttp_intermediates \ + target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates \ + target/common/obj/JAVA_LIBRARIES/voip-common_intermediates \ # not java libraries PDK_PLATFORM_JAVA_ZIP_CONTENTS += \ @@ -76,7 +78,7 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR := \ $(PDK_PLATFORM_JAVA_ZIP_JAVA_HOST_LIB_DIR) PDK_PLATFORM_JAVA_ZIP_CONTENTS += $(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR),\ - $(lib_dir)/classes.jar $(lib_dir)/javalib.jar) + $(lib_dir)/classes.jack $(lib_dir)/classes.jar $(lib_dir)/javalib.jar) # check and override java support level ifneq ($(TARGET_BUILD_PDK)$(PDK_FUSION_PLATFORM_ZIP),) |