am 6fdf121c: Fix 64 bit emulator booting (again).

* commit '6fdf121c192944f13255a8908df802051fec6535':
  Fix 64 bit emulator booting (again).
This commit is contained in:
Narayan Kamath
2014-06-23 19:46:09 +00:00
committed by Android Git Automerger
3 changed files with 3 additions and 3 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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