Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9f24bba authored by Dorin Drimus's avatar Dorin Drimus Committed by Automerger Merge Worker
Browse files

Merge "Fix build breakage" am: 74acdf71 am: ddbbff9d am: fd3ae7cd am: a93ef62c 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2077499



Change-Id: I2189290477f7c7d61f3f3c334c7af4f8089a88bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f3df184 a93ef62c

system/btif/src/stack_manager.cc

+0 −21
Original line number Diff line number Diff line
@@ -76,27 +76,6 @@ 


// Validate or respond to various conditional compilation flags



#ifdef BLE_PRIVACY_SPT

// When BLE_PRIVACY_SPT is not used anymore this check and error statement may be removed.

#warning \

    "#define BLE_PRIVACY_SPT FALSE preprocessor compilation flag is no longer used"

#warning \

    "  To disable LE privacy for a device \

set 'bluetooth.core.gap.le.privacy.enabled' sysprop to false"

#if BLE_PRIVACY_SPT == FALSE

#error "*** Conditional Compilation Directive error"

#endif

#endif



#ifdef BLE_LOCAL_PRIVACY_ENABLED

// When BLE_PRIVACY_SPT is not used anymore this warning statement may be removed.

#warning \

    "#define BLE_LOCAL_PRIVACY_ENABLED FALSE preprocessor compilation flag is no longer used"

#warning \

    "  To disable LE privacy for a device \

set 'bluetooth.core.gap.le.privacy.enabled sysprop' to false"

#endif



#if SDP_RAW_DATA_INCLUDED != TRUE

// Once SDP_RAW_DATA_INCLUDED is no longer exposed via bt_target.h

// this check and error statement may be removed.