Merge branch 'aosp/honeycomb-LTE-release' into honeycomb-mr2-x86

Conflicts:
	core/build_id.mk

diff --cc core/Makefile
Simple merge

diff --cc core/main.mk
Simple merge

diff --cc target/board/generic_x86/device.mk
index 0170527,bbdc8f4..b47f51d
--- 1/target/board/generic_x86/device.mk
--- 2/target/board/generic_x86/device.mk
+++ b/target/board/generic_x86/device.mk
@@@ -1,76 -1,9 +1,76 @@@
 -ifeq ($(TARGET_PREBUILT_KERNEL),)
 -LOCAL_KERNEL := prebuilt/android-x86/kernel/kernel
 -else
 -LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
 -endif
 +#
 +# Copyright (C) 2011 The Android-x86 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 the product aspects that
 +# are specific to the emulator.
 +
 +PRODUCT_DIR := $(dir $(lastword $(filter device/%,$(ALL_PRODUCTS))))
 +
 +PRODUCT_PROPERTY_OVERRIDES := \
 +    ro.ril.hsxpa=1 \
 +    ro.ril.gprsclass=10 \
 +    ro.com.android.dataroaming=true
 +
 +PRODUCT_COPY_FILES := \
 +    device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml \
 +    $(if $(wildcard $(PRODUCT_DIR)init.rc),$(PRODUCT_DIR),$(LOCAL_PATH)/)init.rc:root/init.rc \
 +    $(if $(wildcard $(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc:root/init.$(TARGET_PRODUCT).rc) \
 +    $(if $(wildcard $(PRODUCT_DIR)excluded-input-devices.xml),$(PRODUCT_DIR),$(LOCAL_PATH)/)excluded-input-devices.xml:system/etc/excluded-input-devices.xml \
 +    $(strip $(foreach f,$(wildcard device/common/app/*.apk $(PRODUCT_DIR)app/*.apk),$(f):system/app/$(notdir $(f))))
  
  PRODUCT_COPY_FILES += \
 -    $(LOCAL_KERNEL):kernel \
 -    build/target/board/generic_x86/init.rc:root/init.rc
 +    frameworks/base/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \
 +    frameworks/base/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
 +    frameworks/base/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
 +    frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \
 +    frameworks/base/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
 +    frameworks/base/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \
 +    frameworks/base/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
 +    frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
 +    frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
 +    frameworks/base/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
 +    frameworks/base/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
 +    packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml
 +
- PRODUCT_LOCALES := hdpi mdpi
++PRODUCT_LOCALES := en_US
 +
 +PRODUCT_TAGS += dalvik.gc.type-precise
 +
- PRODUCT_CHARACTERISTICS := tablet,nosdcard
++PRODUCT_CHARACTERISTICS := tablet
 +
 +# Get the touchscreen calibration tool
 +$(call inherit-product-if-exists,external/tslib/tslib.mk)
 +
 +# Get the hardware acceleration libraries
 +$(call inherit-product-if-exists,device/common/gpu/gpu_mesa.mk)
 +
 +# Get some sounds
 +$(call inherit-product-if-exists,frameworks/base/data/sounds/AllAudio.mk)
 +
 +# Get a list of languages.
 +$(call inherit-product-if-exists,$(SRC_TARGET_DIR)/product/locales_full.mk)
 +
 +# Get tablet dalvik parameters
 +$(call inherit-product-if-exists,frameworks/base/build/tablet-dalvik-heap.mk)
 +
 +# Get the alsa files
 +$(call inherit-product-if-exists,$(SRC_TARGET_DIR)/board/generic_x86/alsa.mk)
 +
 +# Get the TTS language packs
 +$(call inherit-product-if-exists,external/svox/pico/lang/all_pico_languages.mk)
 +
 +# Get GMS
 +$(call inherit-product-if-exists,vendor/google/products/gms.mk)

diff --cc target/product/generic_x86.mk
index a69a013,345a79a..af00e50
--- 1/target/product/generic_x86.mk
--- 2/target/product/generic_x86.mk
+++ b/target/product/generic_x86.mk
@@@ -1,59 -1,34 +1,62 @@@
  # This is a generic product that isn't specialized for a specific device.
 -# It includes the base Android platform. If you need Google-specific features,
 -# you should derive from generic_with_google.mk
 +# It includes the base Android-x86 platform.
  
  PRODUCT_PACKAGES := \
 -    DeskClock \
 -    AlarmProvider \
 -    Calendar \
 -    Camera \
 -    DrmProvider \
 -    LatinIME \
 -    Mms \
 -    Music \
 -    Settings \
 -    Sync \
 -    Updater \
 -    CalendarProvider \
 -    SubscribedFeedsProvider \
 -    SyncProvider
 +    BasicSmsReceiver \
 +    GlobalTime \
 +    HoloSpiralWallpaper \
 +    JETBoy \
 +    LiveWallpapers \
 +    LiveWallpapersPicker \
 +    LunarLander \
 +    MagicSmokeWallpapers \
 +    NotePad \
 +    Provision \
 +    RSSReader \
 +    Snake \
 +    SoundRecorder \
 +    Stk \
 +    VideoEditor \
 +    VisualizationWallpapers \
 +    VoiceDialer \
 +    acoustics.default \
 +    alsa_ctl \
 +    alsa.default \
 +    chat \
 +    drmserver \
 +    faketsd \
 +    icu.dat \
 +    libdrmframework_jni \
 +    make_ext4fs \
 +    powerbtnd \
 +    v86d \
  
 -$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
 +PRODUCT_PACKAGES += \
 +    badblocks \
 +    e2fsck \
 +    mke2fs \
 +    resize2fs \
 +    tune2fs \
 +
 +THIRD_PARTY_APPS = \
++    AndroidTerm \
 +    ConnectBot \
 +    FileManager \
 +    LIME \
++    ZeroXBenchmark \
 +
 +# Generic x86 device configurations
 +$(call inherit-product,$(SRC_TARGET_DIR)/board/generic_x86/device.mk)
 +
 +# Get everything else from the parent package
 +$(call inherit-product,$(SRC_TARGET_DIR)/product/generic.mk)
  
  # Overrides
  PRODUCT_BRAND := generic_x86
  PRODUCT_DEVICE := generic_x86
  PRODUCT_NAME := generic_x86
  PRODUCT_POLICY := android.policy_phone
++PRODUCT_LOCALES += mdpi
  
 -# If running on an emulator or some other device that has a LAN connection
 -# that isn't a wifi connection. This will instruct init.rc to enable the
 -# network connection so that you can use it with ADB
 -ifdef NET_ETH0_STARTONBOOT
 -  PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
 -endif
 +GENERIC_X86_CONFIG_MK := $(SRC_TARGET_DIR)/board/generic_x86/BoardConfig.mk
 +GENERIC_X86_ANDROID_MK := $(SRC_TARGET_DIR)/board/generic_x86/AndroidBoard.mk