Merge kwd to master

Add ims-common support from kwd

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
This commit is contained in:
Wink Saville 2014-06-11 15:10:51 -07:00
parent fa3aebf762
commit 273c22cbc0
2 changed files with 3 additions and 0 deletions

View file

@ -61,6 +61,7 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \
target/common/obj/JAVA_LIBRARIES/android.test.runner_intermediates \ target/common/obj/JAVA_LIBRARIES/android.test.runner_intermediates \
target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates \ target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates \
target/common/obj/JAVA_LIBRARIES/voip-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/mms-common_intermediates \
target/common/obj/JAVA_LIBRARIES/android-ex-camera2_intermediates \ target/common/obj/JAVA_LIBRARIES/android-ex-camera2_intermediates \
target/common/obj/JAVA_LIBRARIES/android-common_intermediates \ target/common/obj/JAVA_LIBRARIES/android-common_intermediates \

View file

@ -40,6 +40,7 @@ PRODUCT_PACKAGES += \
framework-res \ framework-res \
idmap \ idmap \
installd \ installd \
ims-common \
ip \ ip \
ip-up-vpn \ ip-up-vpn \
ip6tables \ ip6tables \
@ -83,6 +84,7 @@ PRODUCT_BOOT_JARS := \
framework2 \ framework2 \
telephony-common \ telephony-common \
voip-common \ voip-common \
ims-common \
mms-common \ mms-common \
android.policy \ android.policy \
services \ services \