diff options
| author | Narayan Kamath <narayan@google.com> | 2014-06-23 17:52:53 +0100 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-07-30 09:35:41 -0700 |
| commit | 97eae625a08491f55b8f9a05e793bbf73119e079 (patch) | |
| tree | 4c59e175b19b8c159208143c5186d0900338d821 | |
| parent | 0ad0d197c327c217f4f171a0b8b872c4fbbdc827 (diff) | |
| download | build-97eae625a08491f55b8f9a05e793bbf73119e079.tar.gz | |
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
| -rw-r--r-- | target/product/sdk_arm64.mk | 2 | ||||
| -rw-r--r-- | target/product/sdk_mips64.mk | 2 | ||||
| -rw-r--r-- | 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 6b177e8f72..9aa58b3a88 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 d5ab8246ce..c46eaed8a8 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 d50d1c43c5..62f2dbba77 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 |