From c8d742a1191c1da80c2ad211a53a40faaa891588 Mon Sep 17 00:00:00 2001
From: Chia-chi Yeh <chiachi@android.com>
Date: Fri, 21 Oct 2011 13:59:46 -0700
Subject: [PATCH] Move VpnDialogs into core.mk.

It is required by the APIs of user space VPN.

Bug: 5495078
Change-Id: I30c309c4f6467a35fca95e76f666799816874752
---
 target/product/core.mk                 | 1 +
 target/product/generic_no_telephony.mk | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/product/core.mk b/target/product/core.mk
index aac703ea8..0f298acb1 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -41,6 +41,7 @@ PRODUCT_PACKAGES := \
     SharedStorageBackup \
     TelephonyProvider \
     UserDictionaryProvider \
+    VpnDialogs \
     apache-xml \
     bouncycastle \
     bu \
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index d165b0f65..0d87fc332 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -43,7 +43,6 @@ PRODUCT_PACKAGES := \
     Updater \
     CalendarProvider \
     SyncProvider \
-    VpnDialogs \
     bluetooth-health \
     hostapd \
     wpa_supplicant.conf
-- 
2.11.0