diff options
author | David Turner <digit@android.com> | 2011-03-04 12:39:52 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-04 12:39:52 -0800 |
commit | 51de64377b402ccfd9a10c8f51a7d4c1b3f1bcc4 (patch) | |
tree | e454d97196d4ebb8e88e489de615f82ef36cc30f | |
parent | dfa82c438f5557c5bae3b8f8ae2dc8444edc8036 (diff) | |
parent | 9edd4fa0a629e178382bacf11bd8875ae826d651 (diff) | |
download | build-51de64377b402ccfd9a10c8f51a7d4c1b3f1bcc4.zip build-51de64377b402ccfd9a10c8f51a7d4c1b3f1bcc4.tar.gz build-51de64377b402ccfd9a10c8f51a7d4c1b3f1bcc4.tar.bz2 |
am 9edd4fa0: Merge "x86: sdk_x86 build target"
* commit '9edd4fa0a629e178382bacf11bd8875ae826d651':
x86: sdk_x86 build target
-rw-r--r-- | target/product/AndroidProducts.mk | 1 | ||||
-rw-r--r-- | target/product/sdk_x86.mk | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 56858e1..6096a89 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -40,5 +40,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/full_x86.mk \ $(LOCAL_DIR)/vbox_x86.mk \ $(LOCAL_DIR)/sdk.mk \ + $(LOCAL_DIR)/sdk_x86.mk \ $(LOCAL_DIR)/sim.mk endif diff --git a/target/product/sdk_x86.mk b/target/product/sdk_x86.mk new file mode 100644 index 0000000..6c5e746 --- /dev/null +++ b/target/product/sdk_x86.mk @@ -0,0 +1,28 @@ +# +# Copyright (C) 2009 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# 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. + +$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk) + +# Overrides +PRODUCT_BRAND := generic_x86 +PRODUCT_NAME := sdk_x86 +PRODUCT_DEVICE := generic_x86 +PRODUCT_MODEL := Android SDK built for x86 |