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

Commit eabb34fb authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Move emulator.mk out of full_base.mk" into jb-mr2-dev

parents d5198cbc e8f54065

target/product/full.mk

+2 −0
Original line number Original line 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)/product/full_base_telephony.mk)

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

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





include $(SRC_TARGET_DIR)/product/emulator.mk



# Overrides

# Overrides

PRODUCT_NAME := full

PRODUCT_NAME := full

PRODUCT_DEVICE := generic

PRODUCT_DEVICE := generic

target/product/full_base.mk

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

    VisualizationWallpapers \

    PhotoTable

    PhotoTable





include $(SRC_TARGET_DIR)/product/emulator.mk



# Additional settings used in all AOSP builds

# Additional settings used in all AOSP builds

PRODUCT_PROPERTY_OVERRIDES := \

PRODUCT_PROPERTY_OVERRIDES := \

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

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

target/product/full_mips.mk

+2 −0
Original line number Original line 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)/product/full_base_telephony.mk)

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

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





include $(SRC_TARGET_DIR)/product/emulator.mk



# Overrides

# Overrides

PRODUCT_NAME := full_mips

PRODUCT_NAME := full_mips

PRODUCT_DEVICE := generic_mips

PRODUCT_DEVICE := generic_mips

target/product/full_x86.mk

+2 −0
Original line number Original line 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)/product/full_base_telephony.mk)

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

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





include $(SRC_TARGET_DIR)/product/emulator.mk



ifdef NET_ETH0_STARTONBOOT

ifdef NET_ETH0_STARTONBOOT

  PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1

  PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1

endif

endif