Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8f54065 authored by Ying Wang's avatar Ying Wang
Browse files

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.

Change-Id: I475f7262eaa65dd85fc844ed357547c76c82598f
parent 3e3a3a2b

target/product/full.mk

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)



include $(SRC_TARGET_DIR)/product/emulator.mk



# Overrides

PRODUCT_NAME := full

PRODUCT_DEVICE := generic

target/product/full_base.mk

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ PRODUCT_PACKAGES += \ 
    VisualizationWallpapers \

    PhotoTable



include $(SRC_TARGET_DIR)/product/emulator.mk



# Additional settings used in all AOSP builds

PRODUCT_PROPERTY_OVERRIDES := \

    ro.com.android.dateformat=MM-dd-yyyy \

target/product/full_mips.mk

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips/device.mk)



include $(SRC_TARGET_DIR)/product/emulator.mk



# Overrides

PRODUCT_NAME := full_mips

PRODUCT_DEVICE := generic_mips

target/product/full_x86.mk

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)



include $(SRC_TARGET_DIR)/product/emulator.mk



ifdef NET_ETH0_STARTONBOOT

  PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1

endif