aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbohu <bohu@google.com>2018-06-05 00:01:36 -0700
committerbohu <bohu@google.com>2018-06-05 00:01:36 -0700
commit62d494b3fd8abc61771a9408bf215dcda707e525 (patch)
tree0ba94309ece1a622a369dcc00b196ee6890ca756
parentc5e25e9b84ac24a5f6467c9c830fee0b50df0e61 (diff)
downloadbuild-62d494b3fd8abc61771a9408bf215dcda707e525.tar.gz
emulator: add host tools to sdk_phone_x86/64
Fix sdk_x86-sdk build breakage that requires host tools. BUG: 109716817 Test: make -j110 PRODUCT-sdk_x86-sdk showcommands dist DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk/4821124 sdk_repo Change-Id: I7b0b4d0e3b2c79bad305bc11a5c1d04eb1f2bdd1
-rw-r--r--target/product/sdk_phone_x86.mk4
-rw-r--r--target/product/sdk_phone_x86_64.mk4
2 files changed, 8 insertions, 0 deletions
diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk
index 6423625b4e..b34e5b6dc2 100644
--- a/target/product/sdk_phone_x86.mk
+++ b/target/product/sdk_phone_x86.mk
@@ -16,6 +16,10 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk)
+# Define the host tools and libs that are parts of the SDK.
+-include sdk/build/product_sdk.mk
+-include development/build/product_sdk.mk
+
# Overrides
PRODUCT_BRAND := Android
PRODUCT_NAME := sdk_phone_x86
diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk
index bffbc7bf91..37c078e7cc 100644
--- a/target/product/sdk_phone_x86_64.mk
+++ b/target/product/sdk_phone_x86_64.mk
@@ -16,6 +16,10 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
+# Define the host tools and libs that are parts of the SDK.
+-include sdk/build/product_sdk.mk
+-include development/build/product_sdk.mk
+
# Overrides
PRODUCT_BRAND := Android
PRODUCT_NAME := sdk_phone_x86_64