diff options
| author | Nicholas Sauer <nicksauer@google.com> | 2015-03-27 09:26:27 -0700 |
|---|---|---|
| committer | Nicholas Sauer <nicksauer@google.com> | 2015-03-27 09:28:45 -0700 |
| commit | 1b2637e2166dd6a8cfae6d717154221f9bdbadfa (patch) | |
| tree | f61dd3714d32f6d46e1a7c361f44c8d28447daca /core/pdk_config.mk | |
| parent | ac1da77e65f593869f389cf826fb28d19fc17860 (diff) | |
| download | build-1b2637e2166dd6a8cfae6d717154221f9bdbadfa.zip build-1b2637e2166dd6a8cfae6d717154221f9bdbadfa.tar.gz build-1b2637e2166dd6a8cfae6d717154221f9bdbadfa.tar.bz2 | |
Add required projects to pdk build on master.
Added:
-android.test.runner_intermediates
-android-common_intermediates
-bouncycastle_intermediates
-conscrypt_intermediates
-okhttp_intermediates
Removed:
-mms-common_intermediates (which was deprecated)
Also, alphabetize the list.
Change-Id: Ida5ef79b7176edfe006f50d224bcd64b75843832
Diffstat (limited to 'core/pdk_config.mk')
| -rw-r--r-- | core/pdk_config.mk | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/core/pdk_config.mk b/core/pdk_config.mk index 838754f..bc6f5bd 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 += \ |