diff options
| -rw-r--r-- | core/dex_preopt.mk | 2 | ||||
| -rw-r--r-- | core/pathmap.mk | 1 | ||||
| -rw-r--r-- | core/pdk_config.mk | 1 | ||||
| -rw-r--r-- | target/product/core.mk | 1 | ||||
| -rw-r--r-- | target/product/mini.mk | 1 |
5 files changed, 4 insertions, 2 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 4c51b10..82dd153 100644 --- a/core/dex_preopt.mk +++ b/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) diff --git a/core/pathmap.mk b/core/pathmap.mk index 4aec521..466dda5 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -97,7 +97,6 @@ FRAMEWORKS_BASE_SUBDIRS := \ wifi \ keystore \ icu4j \ - voip \ ) # diff --git a/core/pdk_config.mk b/core/pdk_config.mk index 894b626..28c01f3 100644 --- a/core/pdk_config.mk +++ b/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 := \ diff --git a/target/product/core.mk b/target/product/core.mk index a97894a..03ed394 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -129,6 +129,7 @@ PRODUCT_PACKAGES += \ lint \ uiautomator \ telephony-common \ + voip-common \ mms-common # SELinux packages diff --git a/target/product/mini.mk b/target/product/mini.mk index 3c24876..cb4f6e2 100644 --- a/target/product/mini.mk +++ b/target/product/mini.mk @@ -151,6 +151,7 @@ PRODUCT_PACKAGES += \ sensorservice \ lint \ telephony-common \ + voip-common \ mms-common PRODUCT_COPY_FILES += \ |