From 6652e839f4514c16fad656942fc02c17150c5464 Mon Sep 17 00:00:00 2001 From: Kevin Schoedel Date: Thu, 25 Nov 2021 17:28:55 -0500 Subject: [PATCH] Fix broken gn_build.sh builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Problem Builds of the ‘fake’ platform (which are included in `gn_build.sh`) fail since commit e0a8db72ee2. That changed the default state of the `CHIP_ENABLE_ROTATING_DEVICE_ID` flag, which excludes a definition in `ConfigurationManagerImpl` in `src/platform/fake/ConfigurationManagerImpl.h` but not in the corresponding base class. #### Change overview Remove the `#if` #### Testing `gn_build.sh` --- src/platform/fake/ConfigurationManagerImpl.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/platform/fake/ConfigurationManagerImpl.h b/src/platform/fake/ConfigurationManagerImpl.h index 37398aad8328b8..6245f0823ce1c0 100644 --- a/src/platform/fake/ConfigurationManagerImpl.h +++ b/src/platform/fake/ConfigurationManagerImpl.h @@ -60,9 +60,7 @@ class ConfigurationManagerImpl : public ConfigurationManager CHIP_ERROR StoreSetupPinCode(uint32_t setupPinCode) override { return CHIP_ERROR_NOT_IMPLEMENTED; } CHIP_ERROR GetSetupDiscriminator(uint16_t & setupDiscriminator) override { return CHIP_ERROR_NOT_IMPLEMENTED; } CHIP_ERROR StoreSetupDiscriminator(uint16_t setupDiscriminator) override { return CHIP_ERROR_NOT_IMPLEMENTED; } -#if CHIP_ENABLE_ROTATING_DEVICE_ID CHIP_ERROR GetLifetimeCounter(uint16_t & lifetimeCounter) override { return CHIP_ERROR_NOT_IMPLEMENTED; } -#endif CHIP_ERROR GetFailSafeArmed(bool & val) override { return CHIP_ERROR_NOT_IMPLEMENTED; } CHIP_ERROR SetFailSafeArmed(bool val) override { return CHIP_ERROR_NOT_IMPLEMENTED; } CHIP_ERROR GetBLEDeviceIdentificationInfo(Ble::ChipBLEDeviceIdentificationInfo & deviceIdInfo) override