diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-10 22:39:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-10 22:39:26 +0000 |
| commit | fa21f9db1cfcf35efd0566f8dd03785f6164a488 (patch) | |
| tree | ffe844edd4f42677de8623767fd01eac8ffad3f2 /target/product | |
| parent | ecc28e9525e869f72ea0b1c70250db32d2d81e0a (diff) | |
| parent | 30dbfce52fdf3ec554b1818ac40fea734e8eac3f (diff) | |
| download | build-fa21f9db1cfcf35efd0566f8dd03785f6164a488.zip build-fa21f9db1cfcf35efd0566f8dd03785f6164a488.tar.gz build-fa21f9db1cfcf35efd0566f8dd03785f6164a488.tar.bz2 | |
am 30dbfce5: Merge "Remove the vbox target from the build system."
* commit '30dbfce52fdf3ec554b1818ac40fea734e8eac3f':
Remove the vbox target from the build system.
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 a714f1f..97c5bda 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -59,7 +59,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.mk \ $(LOCAL_DIR)/sdk_x86.mk \ $(LOCAL_DIR)/sdk_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 |