Merge "Merge kwd to master"

This commit is contained in:
Wink Saville
2014-06-13 21:12:32 +00:00
committed by Android (Google) Code Review
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/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 \

View File

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