commit 3b548515fbcc6a9d7baa56252038bdff6a8b608d
author Ying Wang <wangying@android.com> Wed Jul 30 16:40:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 30 16:40:52 2014 +0000
tree 4adf78f7a5d5683858f8064d034f9502188181c4
parent 7dcd694ae07668a734676b7e9b4529fb75d4d918
parent 4b323c62564337c96e0e0694c14d64f1c57182ee

am 4b323c62: Merge "SDK targets should inherit from core_64_bit.mk"

* commit '4b323c62564337c96e0e0694c14d64f1c57182ee':
  SDK targets should inherit from core_64_bit.mk

target/product/sdk_arm64.mk

diff --git a/target/product/sdk_arm64.mk b/target/product/sdk_arm64.mk
index 582a779..6b177e8 100644
--- a/target/product/sdk_arm64.mk
+++ b/target/product/sdk_arm64.mk
@@ -20,6 +20,7 @@
 # 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)
 
 # Overrides
 PRODUCT_BRAND := generic_arm64

target/product/sdk_mips64.mk

diff --git a/target/product/sdk_mips64.mk b/target/product/sdk_mips64.mk
index c00de06..d5ab824 100644
--- a/target/product/sdk_mips64.mk
+++ b/target/product/sdk_mips64.mk
@@ -20,6 +20,7 @@
 # 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)
 
 # Overrides
 PRODUCT_BRAND := generic_mips64

target/product/sdk_x86_64.mk

diff --git a/target/product/sdk_x86_64.mk b/target/product/sdk_x86_64.mk
index 3816cf9..d50d1c4 100644
--- a/target/product/sdk_x86_64.mk
+++ b/target/product/sdk_x86_64.mk
@@ -20,6 +20,7 @@
 # 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)
 
 # Overrides
 PRODUCT_BRAND := generic_x86_64