diff options
| author | Ying Wang <wangying@google.com> | 2014-07-18 15:36:30 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-07-18 15:40:13 -0700 |
| commit | 1f371a1f98b48b4c093e9e1b7a9492bd3688d86f (patch) | |
| tree | 8af52307eba43be9a278deb08e6145be82673bfd /target/product/sdk_x86.mk | |
| parent | 4221873693a3383c1331176b3825bcfcc997aa5a (diff) | |
| download | build-1f371a1f98b48b4c093e9e1b7a9492bd3688d86f.tar.gz build-1f371a1f98b48b4c093e9e1b7a9492bd3688d86f.tar.bz2 build-1f371a1f98b48b4c093e9e1b7a9492bd3688d86f.zip | |
Normalize SDK product name to sdk_<device_type>_<arch_name>
Put the common pieces in sdk_base.mk.
Still keep the old names as aliases.
Bug: 16216170
Change-Id: I39a438843c8b09df1aafff142bd9987962f11ef8
Diffstat (limited to 'target/product/sdk_x86.mk')
| -rw-r--r-- | target/product/sdk_x86.mk | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/target/product/sdk_x86.mk b/target/product/sdk_x86.mk index 6c5e7467c..13ee57d80 100644 --- a/target/product/sdk_x86.mk +++ b/target/product/sdk_x86.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2009 The Android Open Source Project +# Copyright (C) 2014 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,15 +14,8 @@ # limitations under the License. # -# This is a build configuration for a full-featured build of the -# Open-Source part of the tree. It's geared toward a US-centric -# build quite specifically for the emulator, and might not be -# entirely appropriate to inherit from for on-device configurations. +# Don't modify this file - It's just an alias! -$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_phone_x86.mk) -# Overrides -PRODUCT_BRAND := generic_x86 PRODUCT_NAME := sdk_x86 -PRODUCT_DEVICE := generic_x86 -PRODUCT_MODEL := Android SDK built for x86 |