Merge "Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip"

core/dex_preopt.mk

@@ -4,7 +4,7 @@
 ####################################
 
 # TODO: replace it with device's BOOTCLASSPATH
-DEXPREOPT_BOOT_JARS := core:core-junit:bouncycastle:ext:framework:telephony-common:mms-common:android.policy:services:apache-xml
+DEXPREOPT_BOOT_JARS := core:core-junit:bouncycastle:ext:framework:telephony-common:voip-common:mms-common:android.policy:services:apache-xml
 DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS))
 
 DEXPREOPT_BUILD_DIR := $(OUT_DIR)

core/pathmap.mk

@@ -97,7 +97,6 @@ FRAMEWORKS_BASE_SUBDIRS := \
 	    wifi \
 	    keystore \
 	    icu4j \
-	    voip \
 	 )
 
 #

core/pdk_config.mk

@@ -47,6 +47,7 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR := \
 	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/mms-common_intermediates
 # not java libraries
 PDK_PLATFORM_JAVA_ZIP_CONTENTS := \

target/product/core.mk

@@ -129,6 +129,7 @@ PRODUCT_PACKAGES += \
     lint \
     uiautomator \
     telephony-common \
+    voip-common \
     mms-common
 
 # SELinux packages

target/product/mini.mk

@@ -151,6 +151,7 @@ PRODUCT_PACKAGES += \
     sensorservice \
     lint \
     telephony-common \
+    voip-common \
     mms-common
 
 PRODUCT_COPY_FILES += \