diff options
| author | Wink Saville <wink@google.com> | 2012-08-20 20:36:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-20 20:36:19 -0700 |
| commit | f4dce3ace491bd511f63ac60cf5b05cb35799e78 (patch) | |
| tree | 8e90fdea51837afd95a433f58d41d4f92d81218d | |
| parent | e8c14ab3ef1718ddae9ef56abc670878877cc2a5 (diff) | |
| parent | bd6aec2debc5aa267a72412d540b7419bc40f9c7 (diff) | |
| download | device_samsung_tuna-f4dce3ace491bd511f63ac60cf5b05cb35799e78.zip device_samsung_tuna-f4dce3ace491bd511f63ac60cf5b05cb35799e78.tar.gz device_samsung_tuna-f4dce3ace491bd511f63ac60cf5b05cb35799e78.tar.bz2 | |
Merge "Add support for per device bluetooth configuration." into jb-mr1-dev
| -rw-r--r-- | BoardConfig.mk | 5 | ||||
| -rw-r--r-- | bluetooth/bdroid_buildcfg.h | 22 |
2 files changed, 26 insertions, 1 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 6df76b3..b07c668 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -21,6 +21,10 @@ USE_CAMERA_STUB := true # Use the non-open-source parts, if they're present -include vendor/samsung/tuna/BoardConfigVendor.mk +# Default values, if not overridden else where. +TARGET_BOARD_INFO_FILE ?= device/samsung/tuna/board-info.txt +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR ?= device/samsung/tuna/bluetooth + TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI2 := armeabi TARGET_CPU_SMP := true @@ -36,7 +40,6 @@ BOARD_KERNEL_BASE := 0x80000000 TARGET_NO_RADIOIMAGE := true TARGET_BOARD_PLATFORM := omap4 TARGET_BOOTLOADER_BOARD_NAME := tuna -TARGET_BOARD_INFO_FILE ?= device/samsung/tuna/board-info.txt BOARD_EGL_CFG := device/samsung/tuna/egl.cfg BOARD_CREATE_TUNA_HDCP_KEYS_SYMLINK := true 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 |