diff options
| -rw-r--r-- | BoardConfig.mk | 8 | ||||
| -rw-r--r-- | bluetooth/bdroid_buildcfg.h | 22 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/xml/power_profile.xml | 2 | ||||
| -rw-r--r-- | proprietary-blobs.txt | 8 |
4 files changed, 35 insertions, 5 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 9f9d389..2e739d5 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -12,13 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Default values, possibly overridden by BoardConfigVendor.mk +TARGET_BOARD_INFO_FILE := device/samsung/maguro/board-info.txt +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/maguro/bluetooth + # Use the non-open-source part, if present -include vendor/samsung/maguro/BoardConfigVendor.mk -# Use the open-source board-info file if none was set by the vendor -# config. -TARGET_BOARD_INFO_FILE ?= device/samsung/maguro/board-info.txt - # Use the part that is common between all tunas include device/samsung/tuna/BoardConfig.mk diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h new file mode 100644 index 0000000..5c61b6c --- /dev/null +++ b/bluetooth/bdroid_buildcfg.h @@ -0,0 +1,22 @@ +/* + * 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 "Galaxy Nexus 2" + +#endif diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 9bb46a8..feebd3a 100644 --- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -27,7 +27,7 @@ <item name="screen.full">160</item> <!-- 360 max on calendar --> <item name="wifi.on">1</item> <item name="wifi.active">150</item> - <item name="wifi.scan">200</item> + <item name="wifi.scan">100</item> <item name="dsp.audio">150</item> <item name="dsp.video">200</item> <item name="radio.active">150</item> diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt index 33f28c4..09765bd 100644 --- a/proprietary-blobs.txt +++ b/proprietary-blobs.txt @@ -14,7 +14,14 @@ # This file is generated by device/common/generate-blob-lists.sh - DO NOT EDIT +/system/app/Gallery2.apk +/system/app/Nfc.apk /system/bin/fRom +/system/etc/updatecmds/migrate_nfc.txt +/system/lib/libdrmdecrypt.so +/system/lib/libjni_eglfence.so +/system/lib/libjni_mosaic.so +/system/lib/libnfc_jni.so /system/lib/libsecril-client.so /system/vendor/bin/pvrsrvctl /system/vendor/etc/sirfgps.conf @@ -26,6 +33,7 @@ /system/vendor/lib/egl/libGLESv2_POWERVR_SGX540_120.so /system/vendor/lib/hw/gps.omap4.so /system/vendor/lib/hw/gralloc.omap4.so +/system/vendor/lib/libbt-vendor.so /system/vendor/lib/libglslcompiler.so /system/vendor/lib/libIMGegl.so /system/vendor/lib/libinvensense_mpl.so |