From: Chia-chi Yeh <chiachi@android.com>
Date: Fri, 21 Oct 2011 23:04:39 +0000 (-0700)
Subject: Move VpnDialogs into core.mk.
X-Git-Tag: android-x86-4.4-r1~1439^2~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=07767a9e748fdbdab2297974ad01cb265e7fb5a9;p=android-x86%2Fbuild.git

Move VpnDialogs into core.mk.

It is required by the APIs of user space VPN.
Also remove the dead VpnServices.

Bug: 5495078
Change-Id: I321b8da16898cd547ed79bea9c264b5e7bc781eb
---

diff --git a/target/product/core.mk b/target/product/core.mk
index ca5858f22..d45ea1731 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -43,7 +43,7 @@ PRODUCT_PACKAGES := \
     TelephonyProvider \
     TtsService \
     UserDictionaryProvider \
-    VpnServices \
+    VpnDialogs \
     apache-xml \
     bluetooth-health \
     bouncycastle \
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index a1cce7217..416ab25a7 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -43,8 +43,7 @@ PRODUCT_PACKAGES := \
     SystemUI \
     Updater \
     CalendarProvider \
-    SyncProvider \
-    VpnDialogs
+    SyncProvider
 
 PRODUCT_PACKAGES += \
     icu.dat