diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-10 16:15:18 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-10 16:15:18 -0700 |
| commit | 38dc420e19a77e22c49fb568561fb697a91143cd (patch) | |
| tree | 065be27462f71e352d2836dcd9e6df0abc36b2c8 /target/product | |
| parent | c0bdd15b10401b7bf2e1b5acf30e06e7f2d5800c (diff) | |
| parent | fa21f9db1cfcf35efd0566f8dd03785f6164a488 (diff) | |
| download | build-38dc420e19a77e22c49fb568561fb697a91143cd.zip build-38dc420e19a77e22c49fb568561fb697a91143cd.tar.gz build-38dc420e19a77e22c49fb568561fb697a91143cd.tar.bz2 | |
resolved conflicts for merge of fa21f9db to lmp-dev-plus-aosp
Change-Id: I8cd590e7e6f764d6651dcaacd4beb8c72a23164f
Diffstat (limited to 'target/product')
| -rw-r--r-- | target/product/AndroidProducts.mk | 1 | ||||
| -rw-r--r-- | target/product/vbox_x86.mk | 36 |
2 files changed, 0 insertions, 37 deletions
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index abb4d8c..ac5902c 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -60,7 +60,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_mips64.mk \ $(LOCAL_DIR)/aosp_x86_64.mk \ $(LOCAL_DIR)/full_x86_64.mk \ - $(LOCAL_DIR)/vbox_x86.mk \ $(LOCAL_DIR)/sdk_phone_armv7.mk \ $(LOCAL_DIR)/sdk_phone_x86.mk \ $(LOCAL_DIR)/sdk_phone_mips.mk \ diff --git a/target/product/vbox_x86.mk b/target/product/vbox_x86.mk deleted file mode 100644 index a7d1b65..0000000 --- a/target/product/vbox_x86.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -# 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. -ifdef NET_ETH0_STARTONBOOT - PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 -endif - -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/board/vbox_x86/device.mk) - -PRODUCT_PACKAGES += \ - camera.vbox_x86 \ - lights.vbox_x86 \ - gps.vbox_x86 \ - sensors.vbox_x86 - -PRODUCT_NAME := vbox_x86 -PRODUCT_DEVICE := vbox_x86 -PRODUCT_MODEL := Full Android on x86 VirtualBox |