From 6fdf121c192944f13255a8908df802051fec6535 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Mon, 23 Jun 2014 17:52:53 +0100 Subject: 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 --- target/product/sdk_arm64.mk | 2 +- target/product/sdk_mips64.mk | 2 +- target/product/sdk_x86_64.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/product/sdk_arm64.mk b/target/product/sdk_arm64.mk index 6b177e8..9aa58b3 100644 --- a/target/product/sdk_arm64.mk +++ b/target/product/sdk_arm64.mk @@ -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 diff --git a/target/product/sdk_mips64.mk b/target/product/sdk_mips64.mk index d5ab824..c46eaed 100644 --- a/target/product/sdk_mips64.mk +++ b/target/product/sdk_mips64.mk @@ -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 diff --git a/target/product/sdk_x86_64.mk b/target/product/sdk_x86_64.mk index d50d1c4..62f2dbb 100644 --- a/target/product/sdk_x86_64.mk +++ b/target/product/sdk_x86_64.mk @@ -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 -- cgit v1.1