From e364a2b01949600364b032a980dcb432eecb4b2a Mon Sep 17 00:00:00 2001 From: Bunchies101 Date: Sat, 8 Nov 2014 16:11:26 -0800 Subject: [PATCH] Cleanup (2/2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Add Bluetooth Low Energy • Move permissions from vigor to msm8660 • Move WiFi stuff from base of msm8660 & vigor tree to /msm8660/configs/ • Remove 'PRODUCT_AAPT_*' duplicate from vigor and correct it in msm8660 --- bluetooth/include/bdroid_buildcfg.h | 20 ++++++++++++ configs/p2p_supplicant_overlay.conf | 1 + .../wpa_supplicant_overlay.conf | 0 msm8660.mk | 32 +++++++++++-------- 4 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 configs/p2p_supplicant_overlay.conf rename wpa_supplicant_overlay.conf => configs/wpa_supplicant_overlay.conf (100%) diff --git a/bluetooth/include/bdroid_buildcfg.h b/bluetooth/include/bdroid_buildcfg.h index 8f04a74..edce461 100644 --- a/bluetooth/include/bdroid_buildcfg.h +++ b/bluetooth/include/bdroid_buildcfg.h @@ -1,4 +1,24 @@ +/* +* Copyright (C) 2012 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. +*/ #ifndef _BDROID_BUILDCFG_H #define _BDROID_BUILDCFG_H + #define BTM_DEF_LOCAL_NAME "HTC MSM8660" +#define BTA_DISABLE_DELAY 100 /* in milliseconds */ + +#define BLE_INCLUDED TRUE +#define SMP_INCLUDED TRUE #endif diff --git a/configs/p2p_supplicant_overlay.conf b/configs/p2p_supplicant_overlay.conf new file mode 100644 index 0000000..acbace2 --- /dev/null +++ b/configs/p2p_supplicant_overlay.conf @@ -0,0 +1 @@ +disable_scan_offload=1 diff --git a/wpa_supplicant_overlay.conf b/configs/wpa_supplicant_overlay.conf similarity index 100% rename from wpa_supplicant_overlay.conf rename to configs/wpa_supplicant_overlay.conf diff --git a/msm8660.mk b/msm8660.mk index 28bdc6e..12f88a9 100644 --- a/msm8660.mk +++ b/msm8660.mk @@ -25,7 +25,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \ frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \ frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ - frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \ + frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \ frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \ frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \ frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \ @@ -35,11 +35,20 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \ frameworks/native/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \ + frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \ + frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \ + frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml -# WiFi +# WiFi Configs +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \ + $(LOCAL_PATH)/configs/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf + +# Media configuration PRODUCT_COPY_FILES += \ - device/htc/msm8660-common/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf + $(LOCAL_PATH)/configs/media_codecs.xml:system/etc/media_codecs.xml \ + $(LOCAL_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml # Audio PRODUCT_PACKAGES += \ @@ -56,6 +65,10 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ device/common/gps/gps.conf_US_SUPL:system/etc/gps.conf +# WiFi +PRODUCT_PACKAGES += \ + libnetcmdiface + # Graphics PRODUCT_PACKAGES += \ copybit.msm8660 \ @@ -86,7 +99,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ camera.msm8660 \ - libnetcmdiface \ libsurfaceflinger_client # Power @@ -106,22 +118,16 @@ PRODUCT_PACKAGES += \ make_ext4fs \ setup_fs -# Media configuration -PRODUCT_COPY_FILES += \ - device/htc/msm8660-common/configs/media_codecs.xml:system/etc/media_codecs.xml \ - device/htc/msm8660-common/configs/media_profiles.xml:system/etc/media_profiles.xml - - # MSM8660 firmware PRODUCT_COPY_FILES += \ device/htc/msm8660-common/firmware/leia_pfp_470.fw:system/etc/firmware/leia_pfp_470.fw \ device/htc/msm8660-common/firmware/leia_pm4_470.fw:system/etc/firmware/leia_pm4_470.fw \ device/htc/msm8660-common/firmware/vidc_1080p.fw:system/etc/firmware/vidc_1080p.fw - # Device uses high-density artwork where available -PRODUCT_AAPT_CONFIG := normal hdpi -PRODUCT_AAPT_PREF_CONFIG := hdpi +PRODUCT_AAPT_CONFIG := normal hdpi xhdpi +PRODUCT_AAPT_PREF_CONFIG := xhdpi +PRODUCT_LOCALES += en_US # Common build properties PRODUCT_PROPERTY_OVERRIDES += \