diff options
| author | Ed Heyl <ed@google.com> | 2011-03-05 09:31:29 -0800 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2011-03-05 09:31:29 -0800 |
| commit | 8e84514ef5be727edfa95e1f99d7b87943b7837f (patch) | |
| tree | 44d07513e02fcad3f8e64771a238d012af8d28f9 | |
| parent | 54056ffc52f2b623e18c9a01dce2a6ddee049ecc (diff) | |
| parent | 51de64377b402ccfd9a10c8f51a7d4c1b3f1bcc4 (diff) | |
| download | build-8e84514ef5be727edfa95e1f99d7b87943b7837f.zip build-8e84514ef5be727edfa95e1f99d7b87943b7837f.tar.gz build-8e84514ef5be727edfa95e1f99d7b87943b7837f.tar.bz2 | |
resolved conflicts for merge of 51de6437 to honeycomb-plus-aosp
Change-Id: Ie076ccd04fc02fdc6753b4787bcf5ac12f167d4e
| -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 bcd16a2..fafd222 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -40,6 +40,7 @@ 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 \ $(LOCAL_DIR)/large_emu_hw.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 |