diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-23 03:04:48 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-23 03:04:48 +0200 |
| commit | 8e8baa74c467a51dcf1338d3096875f5a0baf868 (patch) | |
| tree | a2bb25cd987bd47e79f0bc2399f6dd46b42acffc /device_base.mk | |
| parent | 55709d40c8df61c6badb8a8ecab6ebfd34b95d60 (diff) | |
| parent | b5f4a69e24cd5dae6c2d014b078c3a2966d14611 (diff) | |
| download | device_samsung_crespo-8e8baa74c467a51dcf1338d3096875f5a0baf868.zip device_samsung_crespo-8e8baa74c467a51dcf1338d3096875f5a0baf868.tar.gz device_samsung_crespo-8e8baa74c467a51dcf1338d3096875f5a0baf868.tar.bz2 | |
Merge remote-tracking branch 'github/ics' into 23072012
Conflicts:
Android.mk
BoardConfigCommon.mk
board-info.txt
device_base.mk
egl.cfg
factory-images/generate-factory-images-package.sh
kernel
overlay/frameworks/base/core/res/res/values/config.xml
Change-Id: If153de549a1a3b5145f856de6c55c825d3124a11
Diffstat (limited to 'device_base.mk')
| -rw-r--r-- | device_base.mk | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/device_base.mk b/device_base.mk index 968e09d..edd2c77 100644 --- a/device_base.mk +++ b/device_base.mk @@ -1,3 +1,4 @@ +# Portions Copyright (C) 2012 VMware, Inc. All Rights Reserved. # Copyright (C) 2010 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -39,7 +40,7 @@ # These is the hardware-specific overlay, which points to the location # of hardware-specific resource overrides, typically the frameworks and # application settings that are stored in resourced. -DEVICE_PACKAGE_OVERLAYS := device/samsung/crespo/overlay +DEVICE_PACKAGE_OVERLAYS += device/samsung/crespo/overlay # These are the hardware-specific configuration files PRODUCT_COPY_FILES := \ @@ -139,7 +140,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ lights.s5pc110 \ hwcomposer.s5pc110 \ - sensors.herring + sensors.herring # Camera PRODUCT_PACKAGES += \ @@ -169,6 +170,10 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ device/samsung/crespo/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc +# Device app +PRODUCT_PACKAGES += \ + CrespoParts + # for bugmailer PRODUCT_PACKAGES += send_bug PRODUCT_COPY_FILES += \ @@ -214,21 +219,6 @@ PRODUCT_TAGS += dalvik.gc.type-precise # Screen size is "normal", density is "hdpi" PRODUCT_AAPT_CONFIG := normal hdpi -ifeq ($(TARGET_PREBUILT_WIFI_MODULE),) -LOCAL_WIFI_MODULE := device/samsung/crespo/bcm4329.ko -else -LOCAL_WIFI_MODULE := $(TARGET_PREBUILT_WIFI_MODULE) -endif - -ifeq ($(TARGET_PREBUILT_KERNEL),) -LOCAL_KERNEL := device/samsung/crespo/kernel -else -LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) -endif - -PRODUCT_COPY_FILES += \ - $(LOCAL_KERNEL):kernel - $(call inherit-product-if-exists, vendor/nxp/pn544/nxp-pn544-fw-vendor.mk) WIFI_BAND := 802_11_BG |