Commit e9eac0aa authored Mar 04, 2013 by Ying Wang Committed by Chirayu Desai Dec 15, 2013

Move emulator.mk out of full_base.mk

Instead we should have the emulator products (full, full_mips, full_x86,
sdk) inherit from emulator.mk directly, because full_base.mk is also
inherited by real device products, such as full_manta.mk.

Conflicts:
	target/product/full_base.mk

Change-Id: I6f5f9255c73be8a4cfad7ddf88c4b633b05a7091

parent 071928d1

target/product/full_base.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -23,8 +23,6 @@ PRODUCT_PACKAGES := \
		libfwdlockengine \
		WAPPushManager

		include $(SRC_TARGET_DIR)/product/emulator.mk

		# Additional settings used in all AOSP builds
		PRODUCT_PROPERTY_OVERRIDES := \
		ro.com.android.dateformat=MM-dd-yyyy