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

Commit 9bee9d7d authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am bb164eb6: Merge "Fix 64 bit emulator booting (again)." 

* commit 'bb164eb6':
  Fix 64 bit emulator booting (again).
parents 3b548515 bb164eb6

target/product/sdk_arm64.mk

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
# build quite specifically for the emulator, and might not be

# entirely appropriate to inherit from for on-device configurations.



$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk)



# Overrides

PRODUCT_BRAND := generic_arm64

target/product/sdk_mips64.mk

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
# build quite specifically for the emulator, and might not be

# entirely appropriate to inherit from for on-device configurations.



$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk)



# Overrides

PRODUCT_BRAND := generic_mips64

target/product/sdk_x86_64.mk

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
# build quite specifically for the emulator, and might not be

# entirely appropriate to inherit from for on-device configurations.



$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk)



# Overrides

PRODUCT_BRAND := generic_x86_64