diff options
author | Wink Saville <wink@google.com> | 2012-08-20 20:35:00 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-20 20:35:01 -0700 |
commit | cb6ebc9f7db10f598bdb56366b306e6fc38feb06 (patch) | |
tree | 39c96061743cdd2c1b2ff1669ad45e570ef83392 | |
parent | fa23a704027b8c3fff7e70351da8af12118cd624 (diff) | |
parent | 4a3770acf765f83eb6e114048b62488312b4a0af (diff) | |
download | panda-cb6ebc9f7db10f598bdb56366b306e6fc38feb06.tar.gz |
Merge "Add support for per device bluetooth configuration." into jb-mr1-dev
-rw-r--r-- | BoardConfig.mk | 4 | ||||
-rw-r--r-- | bluetooth/bdroid_buildcfg.h | 22 |
2 files changed, 26 insertions, 0 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 6f4ed80..4211588 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -19,6 +19,10 @@ BOARD_USES_GENERIC_AUDIO := false USE_CAMERA_STUB := true +# Default values, possibly overridden by BoardConfigVendor.mk +TARGET_BOARD_INFO_FILE := device/ti/panda/board-info.txt +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/ti/panda/bluetooth + # Use the non-open-source parts, if they're present -include vendor/ti/panda/BoardConfigVendor.mk diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h new file mode 100644 index 0000000..aa5d012 --- /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 "Panda Nexus" + +#endif |