diff options
| author | Wink Saville <wink@google.com> | 2014-06-11 15:10:51 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2014-06-11 15:21:03 -0700 |
| commit | 273c22cbc06f3939f85aeb6013b4594d2cf9fbde (patch) | |
| tree | 9b72b22d561b20e74a10079d9160c644cf2db3b3 | |
| parent | fa3aebf76285da0275be52a2254013dfd53b0e19 (diff) | |
| download | build-273c22cbc06f3939f85aeb6013b4594d2cf9fbde.zip build-273c22cbc06f3939f85aeb6013b4594d2cf9fbde.tar.gz build-273c22cbc06f3939f85aeb6013b4594d2cf9fbde.tar.bz2 | |
Merge kwd to master
Add ims-common support from kwd
Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
| -rw-r--r-- | core/pdk_config.mk | 1 | ||||
| -rw-r--r-- | target/product/core_minimal.mk | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/pdk_config.mk b/core/pdk_config.mk index 51f2e17..6a874fb 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -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 \ diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index 8c1e575..165f6ac 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -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 \ |