Merge "Add bluetooth build config for mainline" am: 375291fa26

am: 6b50388c80

Change-Id: Ic4649601625e2717cd37b6a2902c22c258eff175
This commit is contained in:
Anton Hansson 2019-02-07 00:19:37 -08:00 committed by android-build-merger
commit 9e78eb58ba
2 changed files with 32 additions and 0 deletions

View file

@ -31,5 +31,9 @@ BOARD_USES_SYSTEM_OTHER_ODEX := true
# Audio: must using XML format for Treblized devices # Audio: must using XML format for Treblized devices
USE_XML_AUDIO_POLICY_CONF := 1 USE_XML_AUDIO_POLICY_CONF := 1
# Bluetooth defines
# TODO(b/123695868): Remove the need for this
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := build/make/target/board/mainline_arm64/bluetooth
BOARD_AVB_ENABLE := true BOARD_AVB_ENABLE := true
BOARD_AVB_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)

View file

@ -0,0 +1,28 @@
/*
*
* Copyright (c) 2013, The Linux Foundation. All rights reserved.
* Not a Contribution, Apache license notifications and license are retained
* for attribution purposes only.
*
* 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
// VSC spec support
#define BLE_VND_INCLUDED TRUE
#endif