Add iptables and ip6tables to core.mk. (e3996f4d) · Commits · e / os / android_build

core/user_tags.mk

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -154,7 +154,6 @@ GRANDFATHERED_USER_MODULES += \
	init \		init \
	input \		input \
	ip \		ip \
	iptables \
	iself \		iself \
	isprelinked \		isprelinked \
	jarjar \		jarjar \

target/product/core.mk

+25 −23

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,24 @@ PRODUCT_PROPERTY_OVERRIDES := \
	ro.config.alarm_alert=Alarm_Classic.ogg		ro.config.alarm_alert=Alarm_Classic.ogg

	PRODUCT_PACKAGES := \		PRODUCT_PACKAGES := \
			ApplicationsProvider \
			Browser \
			Bugreport \
			Contacts \
			ContactsProvider \
			DefaultContainerService \
			DownloadProvider \
			DownloadProviderUi \
			HTMLViewer \
			Home \
			MediaProvider \
			PackageInstaller \
			PicoTts \
			SettingsProvider \
			TelephonyProvider \
			TtsService \
			UserDictionaryProvider \
			VpnServices \
	apache-xml \		apache-xml \
	bouncycastle \		bouncycastle \
	com.android.location.provider \		com.android.location.provider \
	@@ -41,7 +59,12 @@ PRODUCT_PACKAGES := \
	hprof-conv \		hprof-conv \
	icu.dat \		icu.dat \
	installd \		installd \
			ip \
	ip-up-vpn \		ip-up-vpn \
			ip6tables \
			iptables \
			libOpenMAXAL \
			libOpenSLES \
	libcrypto \		libcrypto \
	libdex \		libdex \
	libdvm \		libdvm \
	@@ -51,34 +74,13 @@ PRODUCT_PACKAGES := \
	libjavacore \		libjavacore \
	libnativehelper \		libnativehelper \
	libnfc_ndef \		libnfc_ndef \
	libOpenMAXAL \
	libOpenSLES \
	libsqlite_jni \		libsqlite_jni \
	libssl \		libssl \
	libwilhelm \		libwilhelm \
	libz \		libz \
			screencap \
	sqlite-jdbc \		sqlite-jdbc \
	wpa_supplicant.conf \		wpa_supplicant.conf
	Browser \
	Contacts \
	Home \
	HTMLViewer \
	ApplicationsProvider \
	ContactsProvider \
	DownloadProvider \
	DownloadProviderUi \
	MediaProvider \
	PicoTts \
	SettingsProvider \
	TelephonyProvider \
	TtsService \
	VpnServices \
	UserDictionaryProvider \
	PackageInstaller \
	DefaultContainerService \
	Bugreport \
	ip \
	screencap

	# host-only dependencies		# host-only dependencies
	ifeq ($(WITH_HOST_DALVIK),true)		ifeq ($(WITH_HOST_DALVIK),true)