From 24cad7d4f7962d3413d520791cb2b8a5a5266f58 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Fri, 29 Jul 2011 13:32:11 -0700
Subject: [PATCH] Add iptables and ip6tables to core.mk.

Change-Id: I1cb2be8a28013b20d1032a8d766021a2f4aca9e1
---
 core/user_tags.mk      |  1 -
 target/product/core.mk | 48 ++++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/core/user_tags.mk b/core/user_tags.mk
index 090b7fad7..120a50221 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -154,7 +154,6 @@ GRANDFATHERED_USER_MODULES += \
 	init \
 	input \
 	ip \
-	iptables \
 	iself \
 	isprelinked \
 	jarjar \
diff --git a/target/product/core.mk b/target/product/core.mk
index 3eb72d383..fb46516f5 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -23,6 +23,24 @@ PRODUCT_PROPERTY_OVERRIDES := \
     ro.config.alarm_alert=Alarm_Classic.ogg
 
 PRODUCT_PACKAGES := \
+    ApplicationsProvider \
+    Browser \
+    Bugreport \
+    Contacts \
+    ContactsProvider \
+    DefaultContainerService \
+    DownloadProvider \
+    DownloadProviderUi \
+    HTMLViewer \
+    Home \
+    MediaProvider \
+    PackageInstaller \
+    PicoTts \
+    SettingsProvider \
+    TelephonyProvider \
+    TtsService \
+    UserDictionaryProvider \
+    VpnServices \
     apache-xml \
     bouncycastle \
     com.android.location.provider \
@@ -41,7 +59,12 @@ PRODUCT_PACKAGES := \
     hprof-conv \
     icu.dat \
     installd \
+    ip \
     ip-up-vpn \
+    ip6tables \
+    iptables \
+    libOpenMAXAL \
+    libOpenSLES \
     libcrypto \
     libdex \
     libdvm \
@@ -51,34 +74,13 @@ PRODUCT_PACKAGES := \
     libjavacore \
     libnativehelper \
     libnfc_ndef \
-    libOpenMAXAL \
-    libOpenSLES \
     libsqlite_jni \
     libssl \
     libwilhelm \
     libz \
+    screencap \
     sqlite-jdbc \
-    wpa_supplicant.conf \
-    Browser \
-    Contacts \
-    Home \
-    HTMLViewer \
-    ApplicationsProvider \
-    ContactsProvider \
-    DownloadProvider \
-    DownloadProviderUi \
-    MediaProvider \
-    PicoTts \
-    SettingsProvider \
-    TelephonyProvider \
-    TtsService \
-    VpnServices \
-    UserDictionaryProvider \
-    PackageInstaller \
-    DefaultContainerService \
-    Bugreport \
-    ip \
-    screencap
+    wpa_supplicant.conf
 
 # host-only dependencies
 ifeq ($(WITH_HOST_DALVIK),true)