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

Commit 97eae625 authored by Narayan Kamath's avatar Narayan Kamath Committed by Ying Wang
Browse files

Fix 64 bit emulator booting (again). 

Not only should they inherit from core_64_bit.mk, we should
inherit from that first to make sure sdk.mk doesn't override
those values with other cruft.

Change-Id: Ibcd3c47b5be92544c1e86b6e85608b875c468461
parent 0ad0d197

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