Generated files from "amd64-generic-codesearch" build 8780126315135740417, revision 4a3cbbad406cedfba437c8a4d00a4a819a81e4f1
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility.h
index 1eee823..f0a4409 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility.h
@@ -22,12 +22,9 @@
#include "cryptohome/auth_factor/auth_factor_storage_type.h"
#include "cryptohome/auth_factor/auth_factor_type.h"
#include "cryptohome/auth_intent.h"
-#include "cryptohome/challenge_credentials/challenge_credentials_helper.h"
#include "cryptohome/cryptorecovery/recovery_crypto_util.h"
#include "cryptohome/error/cryptohome_error.h"
#include "cryptohome/flatbuffer_schemas/auth_block_state.h"
-#include "cryptohome/key_challenge_service.h"
-#include "cryptohome/key_challenge_service_factory_impl.h"
#include "cryptohome/key_objects.h"
#include "cryptohome/username.h"
@@ -116,17 +113,6 @@
const hwsec::RecoveryCryptoFrontend* recovery_hwsec,
brillo::SecureBlob* out_recovery_request,
brillo::SecureBlob* out_ephemeral_pub_key) const = 0;
-
- // Sets challenge_credentials_helper_ and key_challenge_factory_callback_
- // in AuthBlockUtility.
- virtual void InitializeChallengeCredentialsHelper(
- ChallengeCredentialsHelper* challenge_credentials_helper,
- KeyChallengeServiceFactory* key_challenge_service_factory) = 0;
-
- // Returns if the auth_input has valid fields to generate a
- // KeyChallengeService.
- virtual bool IsChallengeCredentialReady(
- const AuthInput& auth_input) const = 0;
};
} // namespace cryptohome
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility_impl.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility_impl.cc
index 53526f7..e249cad 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility_impl.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility_impl.cc
@@ -66,20 +66,22 @@
Crypto* crypto,
Platform* platform,
AsyncInitFeatures* features,
+ AsyncInitPtr<ChallengeCredentialsHelper> challenge_credentials_helper,
+ KeyChallengeServiceFactory* key_challenge_service_factory,
AsyncInitPtr<BiometricsAuthBlockService> bio_service)
: keyset_management_(keyset_management),
crypto_(crypto),
platform_(platform),
features_(features),
+ challenge_credentials_helper_(challenge_credentials_helper),
+ key_challenge_service_factory_(key_challenge_service_factory),
bio_service_(bio_service) {
- DCHECK(keyset_management);
+ DCHECK(keyset_management_);
DCHECK(crypto_);
DCHECK(platform_);
DCHECK(features_);
}
-AuthBlockUtilityImpl::~AuthBlockUtilityImpl() = default;
-
bool AuthBlockUtilityImpl::GetLockedToSingleUser() const {
return platform_->FileExists(base::FilePath(kLockedToSingleUserFile));
}
@@ -244,32 +246,6 @@
return auth_block;
}
-void AuthBlockUtilityImpl::InitializeChallengeCredentialsHelper(
- ChallengeCredentialsHelper* challenge_credentials_helper,
- KeyChallengeServiceFactory* key_challenge_service_factory) {
- if (!challenge_credentials_helper_) {
- challenge_credentials_helper_ = challenge_credentials_helper;
- } else {
- LOG(WARNING) << "ChallengeCredentialsHelper already initialized in "
- "AuthBlockUtility.";
- }
- if (!key_challenge_service_factory_) {
- key_challenge_service_factory_ = key_challenge_service_factory;
- } else {
- LOG(WARNING) << "KeyChallengeServiceFactory already initialized in "
- "AuthBlockUtility.";
- }
-}
-
-bool AuthBlockUtilityImpl::IsChallengeCredentialReady(
- const AuthInput& auth_input) const {
- return (
- challenge_credentials_helper_ != nullptr &&
- key_challenge_service_factory_ != nullptr &&
- auth_input.challenge_credential_auth_input &&
- !auth_input.challenge_credential_auth_input->dbus_service_name.empty());
-}
-
bool AuthBlockUtilityImpl::GetAuthBlockStateFromVaultKeyset(
const std::string& label,
const ObfuscatedUsername& obfuscated_username,
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility_impl.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility_impl.h
index 39ee35e..38defaf 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility_impl.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility_impl.h
@@ -26,6 +26,7 @@
#include "cryptohome/features.h"
#include "cryptohome/flatbuffer_schemas/auth_block_state.h"
#include "cryptohome/key_challenge_service.h"
+#include "cryptohome/key_challenge_service_factory.h"
#include "cryptohome/key_objects.h"
#include "cryptohome/keyset_management.h"
#include "cryptohome/platform.h"
@@ -41,15 +42,17 @@
// |keyset_management|, |crypto| and |platform| are non-owned objects. Caller
// must ensure that these objects are valid for the lifetime of
// AuthBlockUtilityImpl.
- AuthBlockUtilityImpl(KeysetManagement* keyset_management,
- Crypto* crypto,
- Platform* platform,
- AsyncInitFeatures* features,
- AsyncInitPtr<BiometricsAuthBlockService> bio_service);
+ AuthBlockUtilityImpl(
+ KeysetManagement* keyset_management,
+ Crypto* crypto,
+ Platform* platform,
+ AsyncInitFeatures* features,
+ AsyncInitPtr<ChallengeCredentialsHelper> challenge_credentials_helper,
+ KeyChallengeServiceFactory* key_challenge_service_factory,
+ AsyncInitPtr<BiometricsAuthBlockService> bio_service);
AuthBlockUtilityImpl(const AuthBlockUtilityImpl&) = delete;
AuthBlockUtilityImpl& operator=(const AuthBlockUtilityImpl&) = delete;
- ~AuthBlockUtilityImpl() override;
bool GetLockedToSingleUser() const override;
@@ -96,12 +99,6 @@
brillo::SecureBlob* out_recovery_request,
brillo::SecureBlob* out_ephemeral_pub_key) const override;
- void InitializeChallengeCredentialsHelper(
- ChallengeCredentialsHelper* challenge_credentials_helper,
- KeyChallengeServiceFactory* key_challenge_service_factory) override;
-
- bool IsChallengeCredentialReady(const AuthInput& auth_input) const override;
-
// Factory function to construct an auth block of the given type.
CryptoStatusOr<std::unique_ptr<AuthBlock>> GetAuthBlockWithType(
AuthBlockType auth_block_type, const AuthInput& auth_input);
@@ -128,13 +125,13 @@
// Challenge credential helper utility object. This object is required
// for using a challenge response authblock.
- ChallengeCredentialsHelper* challenge_credentials_helper_ = nullptr;
+ AsyncInitPtr<ChallengeCredentialsHelper> challenge_credentials_helper_;
// Factory of key challenge service used to generate a key_challenge_service
// for Challenge Credentials. KeyChallengeService is tasked with contacting
// the challenge response D-Bus service that'll provide the response once
// we send the challenge.
- KeyChallengeServiceFactory* key_challenge_service_factory_ = nullptr;
+ KeyChallengeServiceFactory* key_challenge_service_factory_;
// Biometrics service, used by operations that need to interact with biod.
// TODO(b/276453357): Replace with BiometricsAuthBlockService* once that
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility_impl_unittest.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility_impl_unittest.cc
index 9b63df6..3e01f03 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility_impl_unittest.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/auth_block_utility_impl_unittest.cc
@@ -138,6 +138,9 @@
void MakeAuthBlockUtilityImpl() {
auth_block_utility_impl_ = std::make_unique<AuthBlockUtilityImpl>(
keyset_management_.get(), &crypto_, &platform_, &features_.async,
+ AsyncInitPtr<ChallengeCredentialsHelper>(
+ &challenge_credentials_helper_),
+ &key_challenge_service_factory_,
AsyncInitPtr<BiometricsAuthBlockService>(base::BindRepeating(
&AuthBlockUtilityImplTest::GetBioService, base::Unretained(this))));
}
@@ -844,8 +847,6 @@
return std::make_unique<MockKeyChallengeService>();
});
MakeAuthBlockUtilityImpl();
- auth_block_utility_impl_->InitializeChallengeCredentialsHelper(
- &challenge_credentials_helper_, &key_challenge_service_factory_);
AuthBlock::CreateCallback create_callback = base::BindLambdaForTesting(
[&](CryptohomeStatus error, std::unique_ptr<KeyBlobs> blobs,
@@ -975,8 +976,6 @@
ChallengeCredentialsHelper::GenerateNewOrDecryptResult(
nullptr, std::move(passkey)));
});
- auth_block_utility_impl_->InitializeChallengeCredentialsHelper(
- &challenge_credentials_helper_, &key_challenge_service_factory_);
// Test.
AuthBlock::DeriveCallback derive_callback = base::BindLambdaForTesting(
[&](CryptohomeStatus error, std::unique_ptr<KeyBlobs> blobs,
@@ -1029,6 +1028,8 @@
// Insert MockKeysetManagement into AuthBlockUtility
auth_block_utility_impl_ = std::make_unique<AuthBlockUtilityImpl>(
&keyset_management, &crypto_, &platform_, &features_.async,
+ AsyncInitPtr<ChallengeCredentialsHelper>(&challenge_credentials_helper_),
+ &key_challenge_service_factory_,
AsyncInitPtr<BiometricsAuthBlockService>(nullptr));
// Test
AuthBlockState out_state;
@@ -1501,8 +1502,6 @@
crypto_.Init();
MakeAuthBlockUtilityImpl();
- auth_block_utility_impl_->InitializeChallengeCredentialsHelper(
- &challenge_credentials_helper_, &key_challenge_service_factory_);
EXPECT_CALL(key_challenge_service_factory_, New(kKeyDelegateDBusService))
.WillOnce([](const std::string& bus_name) {
return std::make_unique<MockKeyChallengeService>();
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/challenge_credential_auth_block.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/challenge_credential_auth_block.cc
index 7414a90..3f87e8d 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/challenge_credential_auth_block.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/challenge_credential_auth_block.cc
@@ -65,7 +65,7 @@
std::unique_ptr<AuthBlock> ChallengeCredentialAuthBlock::New(
const AuthInput& auth_input,
- ChallengeCredentialsHelper* challenge_credentials_helper,
+ AsyncInitPtr<ChallengeCredentialsHelper> challenge_credentials_helper,
KeyChallengeServiceFactory* key_challenge_service_factory) {
if (challenge_credentials_helper && key_challenge_service_factory &&
auth_input.challenge_credential_auth_input &&
@@ -73,7 +73,7 @@
auto key_challenge_service = key_challenge_service_factory->New(
auth_input.challenge_credential_auth_input->dbus_service_name);
return std::make_unique<ChallengeCredentialAuthBlock>(
- challenge_credentials_helper, std::move(key_challenge_service),
+ challenge_credentials_helper.get(), std::move(key_challenge_service),
auth_input.username);
}
LOG(ERROR) << "No valid ChallengeCredentialsHelper, KeyChallengeService, or "
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/challenge_credential_auth_block.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/challenge_credential_auth_block.h
index 2cabe63..be9d743 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/challenge_credential_auth_block.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/challenge_credential_auth_block.h
@@ -21,6 +21,7 @@
#include "cryptohome/key_challenge_service.h"
#include "cryptohome/key_challenge_service_factory.h"
#include "cryptohome/username.h"
+#include "cryptohome/util/async_init.h"
namespace cryptohome {
@@ -35,7 +36,7 @@
static CryptoStatus IsSupported(Crypto& crypto);
static std::unique_ptr<AuthBlock> New(
const AuthInput& auth_input,
- ChallengeCredentialsHelper* challenge_credentials_helper,
+ AsyncInitPtr<ChallengeCredentialsHelper> challenge_credentials_helper,
KeyChallengeServiceFactory* key_challenge_service_factory);
ChallengeCredentialAuthBlock(
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/generic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/generic.h
index 889c450..e6d3f9d 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/generic.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/generic.h
@@ -147,7 +147,7 @@
GenericAuthBlockFunctions(
Platform* platform,
AsyncInitFeatures* features,
- ChallengeCredentialsHelper* challenge_credentials_helper,
+ AsyncInitPtr<ChallengeCredentialsHelper> challenge_credentials_helper,
KeyChallengeServiceFactory* key_challenge_service_factory,
AsyncInitPtr<BiometricsAuthBlockService> bio_service,
Crypto* crypto)
@@ -200,7 +200,7 @@
// check it for null and gracefully (i.e. no CHECK) fail.
std::tuple<Platform&,
AsyncInitFeatures&,
- ChallengeCredentialsHelper*,
+ AsyncInitPtr<ChallengeCredentialsHelper>,
KeyChallengeServiceFactory*,
AsyncInitPtr<BiometricsAuthBlockService>,
Crypto&,
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/mock_auth_block_utility.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/mock_auth_block_utility.h
index b7d1d92..d74ee50 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/mock_auth_block_utility.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_blocks/mock_auth_block_utility.h
@@ -83,15 +83,6 @@
brillo::SecureBlob* out_recovery_request,
brillo::SecureBlob* out_ephemeral_pub_key),
(const, override));
- MOCK_METHOD(void,
- InitializeChallengeCredentialsHelper,
- (ChallengeCredentialsHelper * challenge_credentials_helper,
- KeyChallengeServiceFactory* key_challenge_service_factory),
- (override));
- MOCK_METHOD(bool,
- IsChallengeCredentialReady,
- (const AuthInput& auth_input),
- (const, override));
};
} // namespace cryptohome
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_session_keyset_management_unittest.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_session_keyset_management_unittest.cc
index 0e681b1..0527e25 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_session_keyset_management_unittest.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_session_keyset_management_unittest.cc
@@ -144,8 +144,6 @@
std::make_unique<MockLECredentialManager>());
crypto_.Init();
- auth_block_utility_.InitializeChallengeCredentialsHelper(
- &challenge_credentials_helper_, &key_challenge_service_factory_);
auth_session_manager_ = std::make_unique<AuthSessionManager>(
&crypto_, &platform_, &user_session_map_, &keyset_management_,
&auth_block_utility_, &auth_factor_driver_manager_,
@@ -537,10 +535,17 @@
KeysetManagement keyset_management_{&platform_, &crypto_,
CreateMockVaultKeysetFactory()};
FakeFeaturesForTesting features_;
+ NiceMock<MockChallengeCredentialsHelper> challenge_credentials_helper_;
+ NiceMock<MockKeyChallengeServiceFactory> key_challenge_service_factory_;
std::unique_ptr<FingerprintAuthBlockService> fp_service_{
FingerprintAuthBlockService::MakeNullService()};
AuthBlockUtilityImpl auth_block_utility_{
- &keyset_management_, &crypto_, &platform_, &features_.async,
+ &keyset_management_,
+ &crypto_,
+ &platform_,
+ &features_.async,
+ AsyncInitPtr<ChallengeCredentialsHelper>(&challenge_credentials_helper_),
+ &key_challenge_service_factory_,
AsyncInitPtr<BiometricsAuthBlockService>(nullptr)};
NiceMock<MockAuthBlockUtility> mock_auth_block_utility_;
AuthFactorDriverManager auth_factor_driver_manager_{
@@ -569,8 +574,6 @@
MockVaultKeysetFactory* mock_vault_keyset_factory_;
NiceMock<MockHomeDirs> homedirs_;
NiceMock<MockUserSessionFactory> user_session_factory_;
- NiceMock<MockChallengeCredentialsHelper> challenge_credentials_helper_;
- NiceMock<MockKeyChallengeServiceFactory> key_challenge_service_factory_;
NiceMock<MockPkcs11TokenFactory> pkcs11_token_factory_;
NiceMock<MockUserOldestActivityTimestampManager>
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_session_tpm_simulator_unittest.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_session_tpm_simulator_unittest.cc
index afc4053..a88d017 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_session_tpm_simulator_unittest.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_session_tpm_simulator_unittest.cc
@@ -339,7 +339,12 @@
std::unique_ptr<FingerprintAuthBlockService> fp_service_{
FingerprintAuthBlockService::MakeNullService()};
AuthBlockUtilityImpl auth_block_utility_{
- &keyset_management_, &crypto_, &platform_, &features_.async,
+ &keyset_management_,
+ &crypto_,
+ &platform_,
+ &features_.async,
+ AsyncInitPtr<ChallengeCredentialsHelper>(nullptr),
+ nullptr,
AsyncInitPtr<BiometricsAuthBlockService>(nullptr)};
AuthFactorDriverManager auth_factor_driver_manager_{
&platform_,
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_session_unittest.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_session_unittest.cc
index befe49c..fa3dc09 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_session_unittest.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/auth_session_unittest.cc
@@ -44,6 +44,7 @@
#include "cryptohome/auth_factor/auth_factor_metadata.h"
#include "cryptohome/auth_factor/auth_factor_storage_type.h"
#include "cryptohome/auth_factor/auth_factor_type.h"
+#include "cryptohome/challenge_credentials/challenge_credentials_helper.h"
#include "cryptohome/challenge_credentials/mock_challenge_credentials_helper.h"
#include "cryptohome/credential_verifier_test_utils.h"
#include "cryptohome/crypto_error.h"
@@ -1036,6 +1037,7 @@
FakeFeaturesForTesting features;
AuthBlockUtilityImpl real_auth_block_utility(
&keyset_management_, &crypto_, &platform_, &features.async,
+ AsyncInitPtr<ChallengeCredentialsHelper>(nullptr), nullptr,
AsyncInitPtr<BiometricsAuthBlockService>(nullptr));
auto test_backing_apis = backing_apis_;
test_backing_apis.auth_block_utility = &real_auth_block_utility;
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/cryptohome_metrics.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/cryptohome_metrics.cc
index 9a02d77..376681c 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/cryptohome_metrics.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/cryptohome_metrics.cc
@@ -957,11 +957,13 @@
if (auth_factor_type == AuthFactorType::kPassword) {
ReportBackupKeysetCleanupResult(
BackupKeysetCleanupResult::kRemovedBackupPassword);
+ return;
}
if (auth_factor_type == AuthFactorType::kPin) {
ReportBackupKeysetCleanupResult(
BackupKeysetCleanupResult::kRemovedBackupPin);
+ return;
}
ReportBackupKeysetCleanupResult(
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/error/locations.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/error/locations.h
index 320db6c..8816d1b 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/error/locations.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/error/locations.h
@@ -939,7 +939,7 @@
kLocUserDataAuthCantQueryROCAVulnInInitChalRespAuth = 556,
/* =Obsolete= */
kLocUserDataAuthROCAVulnerableInInitChalRespAuth = 557,
- /* ./userdataauth.cc */
+ /* =Obsolete= */
kLocUserDataAuthNoDBusInInitChalRespAuth = 558,
/* =Obsolete= */
kLocUserDataAuthNoDelegateInInitChalRespAuth = 559,
@@ -1771,7 +1771,7 @@
kLocFingerprintAuthBlockNoLabelInPrepareForRemoval = 3530,
/* ./userdataauth.cc */
kLocUserDataAuthNoAuthSessionInUpdateAuthFactorMetadata = 3531,
- /* ./userdataauth.cc */
+ /* =Obsolete= */
kLocUserDataAuthNoAuthFactorInUpdateAuthFactorMetadata = 3532,
/* ./userdataauth.cc */
kLocUserDataAuthProtoFailureInReplyWithAuthFactorStatus = 3533,
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth.cc
index 993cf24..86f83b0 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth.cc
@@ -463,6 +463,15 @@
base::BindRepeating(&UserDataAuth::OnFingerprintScanResult,
base::Unretained(this)));
+ AsyncInitPtr<ChallengeCredentialsHelper> async_cc_helper(base::BindRepeating(
+ [](UserDataAuth* uda) -> ChallengeCredentialsHelper* {
+ uda->AssertOnMountThread();
+ if (uda->challenge_credentials_helper_initialized_) {
+ return uda->challenge_credentials_helper_;
+ }
+ return nullptr;
+ },
+ base::Unretained(this)));
AsyncInitPtr<BiometricsAuthBlockService> async_biometrics_service(
base::BindRepeating(
[](UserDataAuth* uda) {
@@ -473,6 +482,7 @@
if (!auth_block_utility_) {
default_auth_block_utility_ = std::make_unique<AuthBlockUtilityImpl>(
keyset_management_, crypto_, platform_, &async_init_features_,
+ async_cc_helper, key_challenge_service_factory_,
async_biometrics_service);
auth_block_utility_ = default_auth_block_utility_.get();
}
@@ -486,18 +496,8 @@
if (!auth_factor_driver_manager_) {
default_auth_factor_driver_manager_ =
std::make_unique<AuthFactorDriverManager>(
- platform_, crypto_,
- AsyncInitPtr<ChallengeCredentialsHelper>(base::BindRepeating(
- [](UserDataAuth* uda) -> ChallengeCredentialsHelper* {
- uda->AssertOnMountThread();
- if (uda->challenge_credentials_helper_initialized_) {
- return uda->challenge_credentials_helper_;
- }
- return nullptr;
- },
- base::Unretained(this))),
- key_challenge_service_factory_, fingerprint_service_.get(),
- async_biometrics_service);
+ platform_, crypto_, async_cc_helper, key_challenge_service_factory_,
+ fingerprint_service_.get(), async_biometrics_service);
auth_factor_driver_manager_ = default_auth_factor_driver_manager_.get();
}
@@ -660,9 +660,8 @@
base::Unretained(this)));
PostTaskToMountThread(
- FROM_HERE,
- base::BindOnce(&UserDataAuth::InitializeChallengeCredentialsHelper,
- base::Unretained(this)));
+ FROM_HERE, base::BindOnce(&UserDataAuth::InitForChallengeResponseAuth,
+ base::Unretained(this)));
PostTaskToMountThread(FROM_HERE,
base::BindOnce(&UserDataAuth::InitializeFeatureLibrary,
@@ -710,14 +709,6 @@
return features_;
}
-void UserDataAuth::InitializeChallengeCredentialsHelper() {
- AssertOnMountThread();
- CryptohomeStatus status = InitForChallengeResponseAuth();
- if (!status.ok()) {
- LOG(ERROR) << "Failed to initialize challenge_credentials_helper_.";
- }
-}
-
void UserDataAuth::CreateFingerprintManager() {
AssertOnMountThread();
if (!fingerprint_manager_) {
@@ -1450,11 +1441,11 @@
}
}
-CryptohomeStatus UserDataAuth::InitForChallengeResponseAuth() {
+void UserDataAuth::InitForChallengeResponseAuth() {
AssertOnMountThread();
if (challenge_credentials_helper_initialized_) {
// Already successfully initialized.
- return OkStatus<CryptohomeError>();
+ return;
}
if (!challenge_credentials_helper_) {
@@ -1467,19 +1458,11 @@
if (!mount_thread_bus_) {
LOG(ERROR) << "Cannot do challenge-response mount without system D-Bus bus";
- return MakeStatus<CryptohomeError>(
- CRYPTOHOME_ERR_LOC(kLocUserDataAuthNoDBusInInitChalRespAuth),
- ErrorActionSet({PossibleAction::kReboot,
- PossibleAction::kDevCheckUnexpectedState}),
- user_data_auth::CRYPTOHOME_ERROR_MOUNT_FATAL);
+ return;
}
key_challenge_service_factory_->SetMountThreadBus(mount_thread_bus_);
- auth_block_utility_->InitializeChallengeCredentialsHelper(
- challenge_credentials_helper_, key_challenge_service_factory_);
-
challenge_credentials_helper_initialized_ = true;
- return OkStatus<CryptohomeError>();
}
user_data_auth::ListKeysReply UserDataAuth::ListKeys(
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth.h
index 0ce20de..601331f 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth.h
@@ -776,15 +776,9 @@
// Removes an inactive user session.
void RemoveInactiveUserSession(const Username& username);
- // Performs the lazy part of the initialization that is required for
- // performing operations with challenge-response keys. Returns whether
- // succeeded.
- CryptohomeStatus InitForChallengeResponseAuth();
-
// Called on Mount Thread, initializes the challenge_credentials_helper_
- // and the key_challenge_service_factory_, and forwards these
- // arguments to AuthBlockUtility.
- void InitializeChallengeCredentialsHelper();
+ // and the key_challenge_service_factory_.
+ void InitForChallengeResponseAuth();
void GetAuthSessionStatusImpl(
AuthSession* auth_session,
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth_auth_session_unittest.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth_auth_session_unittest.cc
index 3561103..70ec8b1 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth_auth_session_unittest.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth_auth_session_unittest.cc
@@ -354,6 +354,7 @@
AuthSessionInterfaceTest() {
auth_block_utility_impl_ = std::make_unique<AuthBlockUtilityImpl>(
&keyset_management_, &crypto_, &platform_, &features_.async,
+ AsyncInitPtr<ChallengeCredentialsHelper>(nullptr), nullptr,
AsyncInitPtr<BiometricsAuthBlockService>(nullptr));
CreateAuthSessionManager(auth_block_utility_impl_.get());
}
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_health_tool/event/event.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_health_tool/event/event.cc
index 2227d39..3a8c8fc 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_health_tool/event/event.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_health_tool/event/event.cc
@@ -45,6 +45,7 @@
{"touchscreen", mojom::EventCategoryEnum::kTouchscreen},
{"stylus_garage", mojom::EventCategoryEnum::kStylusGarage},
{"stylus", mojom::EventCategoryEnum::kStylus},
+ {"crash", mojom::EventCategoryEnum::kCrash},
};
// Create a stringified list of the category names for use in help.
@@ -110,6 +111,7 @@
case mojom::EventCategoryEnum::kTouchscreen:
case mojom::EventCategoryEnum::kStylusGarage:
case mojom::EventCategoryEnum::kStylus:
+ case mojom::EventCategoryEnum::kCrash:
event_subscriber.SubscribeToEvents(run_loop.QuitClosure(), category);
break;
case mojom::EventCategoryEnum::kNetwork:
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_health_tool/event/event_subscriber.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_health_tool/event/event_subscriber.cc
index ff748ee..d362359 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_health_tool/event/event_subscriber.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_health_tool/event/event_subscriber.cc
@@ -509,6 +509,26 @@
}
}
+void OutputCrashEventInfo(const mojom::CrashEventInfoPtr& info) {
+ base::Value::Dict output;
+ output.Set("crash_type", static_cast<int>(info->crash_type));
+ output.Set("local_id", info->local_id);
+ output.Set("capture_time", info->capture_time.ToDoubleT());
+ if (!info->upload_info.is_null()) {
+ base::Value::Dict upload_info;
+ upload_info.Set("crash_report_id", info->upload_info->crash_report_id);
+ upload_info.Set("creation_time",
+ info->upload_info->creation_time.ToDoubleT());
+ upload_info.Set("offset", static_cast<int>(info->upload_info->offset));
+ output.Set("upload_info", std::move(upload_info));
+ }
+ std::string json;
+ base::JSONWriter::WriteWithOptions(
+ output, base::JSONWriter::Options::OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION,
+ &json);
+ std::cout << "Crash event received: " << json << std::endl;
+}
+
} // namespace
EventSubscriber::EventSubscriber() {
@@ -596,6 +616,9 @@
case mojom::EventInfo::Tag::kStylusEventInfo:
OutputStylusEventInfo(info->get_stylus_event_info());
break;
+ case mojom::EventInfo::Tag::kCrashEventInfo:
+ OutputCrashEventInfo(info->get_crash_event_info());
+ break;
}
}
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/event_aggregator.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/event_aggregator.cc
index ae94310..2f1ceac 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/event_aggregator.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/event_aggregator.cc
@@ -9,6 +9,7 @@
#include "diagnostics/cros_healthd/events/audio_events_impl.h"
#include "diagnostics/cros_healthd/events/audio_jack_events_impl.h"
#include "diagnostics/cros_healthd/events/bluetooth_events_impl.h"
+#include "diagnostics/cros_healthd/events/crash_events.h"
#include "diagnostics/cros_healthd/events/lid_events_impl.h"
#include "diagnostics/cros_healthd/events/power_events_impl.h"
#include "diagnostics/cros_healthd/events/stylus_events_impl.h"
@@ -40,6 +41,7 @@
touchscreen_events_ = std::make_unique<TouchscreenEventsImpl>(context_);
stylus_garage_events_ = std::make_unique<StylusGarageEventsImpl>(context_);
stylus_events_ = std::make_unique<StylusEventsImpl>(context_);
+ crash_events_ = std::make_unique<CrashEvents>(context_);
}
EventAggregator::~EventAggregator() = default;
@@ -96,6 +98,9 @@
case mojom::EventCategoryEnum::kStylus:
stylus_events_->AddObserver(std::move(observer));
break;
+ case mojom::EventCategoryEnum::kCrash:
+ crash_events_->AddObserver(std::move(observer));
+ break;
}
}
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/event_aggregator.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/event_aggregator.h
index 7f65fca..5e78f5a 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/event_aggregator.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/event_aggregator.h
@@ -12,6 +12,7 @@
#include "diagnostics/cros_healthd/events/audio_events.h"
#include "diagnostics/cros_healthd/events/audio_jack_events.h"
#include "diagnostics/cros_healthd/events/bluetooth_events.h"
+#include "diagnostics/cros_healthd/events/crash_events.h"
#include "diagnostics/cros_healthd/events/event_reporter.h"
#include "diagnostics/cros_healthd/events/lid_events.h"
#include "diagnostics/cros_healthd/events/power_events.h"
@@ -77,6 +78,7 @@
std::unique_ptr<TouchscreenEvents> touchscreen_events_;
std::unique_ptr<StylusGarageEvents> stylus_garage_events_;
std::unique_ptr<StylusEvents> stylus_events_;
+ std::unique_ptr<CrashEvents> crash_events_;
EventReporter event_reporter_{context_};
GroundTruth ground_truth_{context_};
};
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events.h
index c3b9ddf..d5c85df 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events.h
@@ -6,15 +6,117 @@
#define DIAGNOSTICS_CROS_HEALTHD_EVENTS_CRASH_EVENTS_H_
#include <cstdint>
+#include <string>
+#include <unordered_map>
#include <vector>
#include <base/strings/string_piece.h>
#include <base/time/time.h>
+#include <base/timer/timer.h>
+#include <mojo/public/cpp/bindings/pending_remote.h>
+#include <mojo/public/cpp/bindings/remote_set.h>
+#include "diagnostics/cros_healthd/mojom/executor.mojom.h"
#include "diagnostics/mojom/public/cros_healthd_events.mojom.h"
namespace diagnostics {
+class Context;
+
+// Interface that allows clients to subscribe to crash events.
+//
+// To manually test crash events on a DUT, first generate some unuploaded and
+// uploaded crashes. This can be done by:
+// (DUT) $ metrics_client -C # Consent for crash reporting.
+// (DUT) $ sleep 100&
+// (DUT) $ kill -SEGV $! # Generating unuploaded crash
+// (DUT) $ crash_sender --dev --max_spread_time=0 # Convert to uploaded crash
+// Now, generate one more unuploaded crash as the previous one have been
+// deleted.
+// (DUT) $ sleep 100&
+// (DUT) $ kill -SEGV $!
+//
+// Subscribe to crash events with cros-health-tool:
+// (DUT) $ cros-health-tool events --category=crash --length_seconds=400
+//
+// Inspect the output and the logs of cros_healthd.
+//
+// You may also want to change the timer period to a smaller time for testing
+// purposes (kPeriod in crash_events_impl.cc). Also check out
+// https://www.chromium.org/chromium-os/packages/crash-reporting/faq/#will-a-developers-build-image-upload-crash-reports
+// for reference.
+class CrashEvents final {
+ public:
+ explicit CrashEvents(Context* context);
+ CrashEvents(const CrashEvents&) = delete;
+ CrashEvents& operator=(const CrashEvents&) = delete;
+ ~CrashEvents();
+
+ void AddObserver(
+ mojo::PendingRemote<ash::cros_healthd::mojom::EventObserver> observer);
+
+ private:
+ // Information related to uploads.log.
+ struct UploadsLogInfo {
+ // Creation time of uploads.log.
+ base::Time creation_time = base::Time();
+ // The location of uploads.log that was read last time.
+ uint64_t byte_location = 0u;
+ // The number of valid logs that have been read from uploads.log.
+ uint64_t offset = 0u;
+ };
+
+ // Collects crashes and emits subscribers crash events.
+ void CollectCrashes();
+
+ // Starts getting uploaded crashes.
+ void StartGettingUploadedCrashes();
+
+ // Handles the output from crash_sender.
+ void HandleUnuploadedCrashCrashSenderResult(
+ const ash::cros_healthd::mojom::ExecutedProcessResultPtr
+ crash_sender_result);
+
+ // Handles the file creation time once finish getting the info of uploads.log.
+ void HandleUploadedCrashGetFileInfoResult(
+ const ash::cros_healthd::mojom::FileInfoPtr file_info);
+
+ // Handles the file content once finish reading uploads.log.
+ void HandleUploadedCrashReadFileResult(base::Time creation_time,
+ const std::optional<std::string>& log);
+
+ // Information related to uploads.log.
+ UploadsLogInfo uploads_log_info_;
+
+ // Uploaded crashes in the past. Would be sent to any new subscribers.
+ std::vector<ash::cros_healthd::mojom::CrashEventInfoPtr>
+ past_uploaded_crashes_;
+
+ // Unuploaded crashes in the past. Would be sent to any new subscribers.
+ std::unordered_map</*local id*/ std::string,
+ ash::cros_healthd::mojom::CrashEventInfoPtr>
+ past_unuploaded_crashes_;
+
+ // The collection of all new observers that haven't received past crashes
+ // yet.
+ std::vector<mojo::RemoteSetElementId> new_observers_;
+
+ // Timer for invoking `CollectCrashes` periodically.
+ base::RepeatingTimer timer_;
+
+ // Each observer in |observers_| will be notified of any crash event
+ // in the ash::cros_healthd::mojom::EventObserver interface. The
+ // RemoteSet manages the lifetime of the endpoints, which are
+ // automatically destroyed and removed when the pipe they are bound to
+ // is destroyed.
+ mojo::RemoteSet<ash::cros_healthd::mojom::EventObserver> observers_;
+
+ // Unowned pointer. Should outlive this instance.
+ Context* const context_ = nullptr;
+
+ base::WeakPtrFactory<CrashEvents> weak_ptr_factory_{this};
+};
+
// Parses log string as the same format used in /var/log/chrome/Crash
// Reports/uploads.log and returns the result. Performs a functionality similar
// to `TextLogUploadList::TryParseJsonLogEntry` in Chromium. If there are any
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events_impl.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events_impl.cc
index 05c05ec..01c9d46 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events_impl.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events_impl.cc
@@ -4,19 +4,29 @@
#include "diagnostics/cros_healthd/events/crash_events.h"
+#include <iterator>
+#include <optional>
#include <string>
#include <utility>
+#include <vector>
#include <base/json/json_reader.h>
#include <base/logging.h>
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_split.h>
#include <base/strings/string_util.h>
+#include <base/timer/timer.h>
+
+#include "diagnostics/cros_healthd/system/context.h"
namespace diagnostics {
namespace mojom = ash::cros_healthd::mojom;
namespace {
+
+// The period of collecting crashes.
+constexpr auto kPeriod = base::Minutes(20);
+
// Parses a single log entry and returns the result.
mojom::CrashEventInfoPtr ParseUploadsLogEntry(const std::string& line,
bool is_uploaded,
@@ -84,9 +94,212 @@
result->capture_time = base::Time::FromDoubleT(capture_time_double);
return result;
-} // namespace =::mojom
+}
} // namespace
+CrashEvents::CrashEvents(Context* context) : context_(context) {
+ CHECK(context_);
+ timer_.Start(FROM_HERE, kPeriod,
+ base::BindRepeating(&CrashEvents::CollectCrashes,
+ weak_ptr_factory_.GetWeakPtr()));
+}
+
+CrashEvents::~CrashEvents() = default;
+
+void CrashEvents::AddObserver(
+ mojo::PendingRemote<mojom::EventObserver> observer) {
+ new_observers_.push_back(observers_.Add(std::move(observer)));
+ timer_.Reset();
+ // Noticeably, there's a very low chance that this may be called during which
+ // the followup tasks of another `CrashEvents::CollectCrashes` call haven't
+ // been done yet. The results won't be affected in this case.
+ CrashEvents::CollectCrashes();
+}
+
+void CrashEvents::CollectCrashes() {
+ // No subscriber, no need to collect any crash events.
+ if (observers_.empty()) {
+ return;
+ }
+
+ // Emit all past crashes to new subscribers.
+ for (const auto observer_id : new_observers_) {
+ auto* observer = observers_.Get(observer_id);
+ if (observer == nullptr) {
+ // The observer is no longer in the observer remote set, likely it has
+ // disconnected already.
+ continue;
+ }
+ for (const auto& [/* unused */ local_id, crash] :
+ past_unuploaded_crashes_) {
+ observer->OnEvent(mojom::EventInfo::NewCrashEventInfo(crash.Clone()));
+ }
+ for (const auto& crash : past_uploaded_crashes_) {
+ observer->OnEvent(mojom::EventInfo::NewCrashEventInfo(crash.Clone()));
+ }
+ }
+ new_observers_.clear();
+
+ // Get unuploaded crashes before getting uploaded crashes. In this way, if an
+ // unuploaded crash is uploaded after we have collected unuploaded crashes and
+ // before we have collected uploaded crashes, the subscriber would be less
+ // confused because it would receive the same crash as unuploaded before as
+ // uploaded.
+ context_->executor()->FetchCrashFromCrashSender(
+ base::BindOnce(&CrashEvents::HandleUnuploadedCrashCrashSenderResult,
+ weak_ptr_factory_.GetWeakPtr()));
+}
+
+void CrashEvents::StartGettingUploadedCrashes() {
+ // Get uploaded crashes. Roughly speaking, first get file info. In the file
+ // info result callback, collect the crashes from uploads.log. Then in the
+ // reading file result callback, it emits crashes to the subscribers.
+ context_->executor()->GetFileInfo(
+ mojom::Executor::File::kCrashLog,
+ base::BindOnce(&CrashEvents::HandleUploadedCrashGetFileInfoResult,
+ weak_ptr_factory_.GetWeakPtr()));
+}
+
+void CrashEvents::HandleUnuploadedCrashCrashSenderResult(
+ const mojom::ExecutedProcessResultPtr crash_sender_result) {
+ if (crash_sender_result->return_code != 0) {
+ LOG(ERROR) << "crash_sender failed with exit code "
+ << crash_sender_result->return_code << ": "
+ << crash_sender_result->err.substr(0u, 30u);
+ // crash_sender failure shouldn't stop healthD from emitting uploaded
+ // crashes.
+ StartGettingUploadedCrashes();
+ return;
+ }
+
+ auto results =
+ ParseUploadsLog(crash_sender_result->out, /*is_uploaded=*/false,
+ /*creation_time=ignored*/ base::Time(),
+ /*init_offset=ignored*/ 0u);
+
+ for (const auto& result : results) {
+ if (past_unuploaded_crashes_.count(result->local_id) > 0) {
+ continue;
+ }
+ for (auto& observer : observers_) {
+ observer->OnEvent(mojom::EventInfo::NewCrashEventInfo(result.Clone()));
+ }
+ }
+
+ // Since crashes that do not appear as unuploaded crashes anymore should have
+ // become uploaded crashes, clear the past unuploaded crashes and
+ // reconstruct them here.
+ past_unuploaded_crashes_.clear();
+ for (auto& result : results) {
+ past_unuploaded_crashes_.insert(
+ std::make_pair(result->local_id, std::move(result)));
+ }
+
+ StartGettingUploadedCrashes();
+}
+
+void CrashEvents::HandleUploadedCrashGetFileInfoResult(
+ const mojom::FileInfoPtr file_info) {
+ if (file_info.is_null()) {
+ LOG(ERROR) << "Failed to get info from uploads.log.";
+ return;
+ }
+
+ context_->executor()->ReadFile(
+ mojom::Executor::File::kCrashLog,
+ base::BindOnce(&CrashEvents::HandleUploadedCrashReadFileResult,
+ weak_ptr_factory_.GetWeakPtr(), file_info->creation_time));
+}
+
+void CrashEvents::HandleUploadedCrashReadFileResult(
+ base::Time creation_time, const std::optional<std::string>& log) {
+ if (!log.has_value()) {
+ LOG(ERROR) << "Failed to read uploads.log.";
+ return;
+ }
+
+ if (creation_time != uploads_log_info_.creation_time) {
+ // New log file.
+ //
+ // Why do we keep past crashes here?
+ // ---------------------------------
+ //
+ // New log file shouldn't be created within one session, as the only normal
+ // (i.e., system not tampered) way to clean uploads.log is powerwash.
+ //
+ // In case of a future uploads.log cleanup behavior change, we document some
+ // of the considerations why we chose to keep all past crash events here. If
+ // uploads.log is cleared within one session and past crashes are cleared,
+ // new subscribers would not receive the same crashes as the other
+ // subscribers do, which is not desirable.
+ //
+ // However, if uploads.log is cleared within one session and the past events
+ // are not cleared (as in this implementation), the following two scenarios
+ // would give subscribers different crash events:
+ //
+ // subscriber X added (receive all uploaded crashes) -> uploads.log cleared
+ // -> subscriber Y added (receive all uploaded crashes)
+ // [no subscribers] -> uploads.log cleared
+ // -> subscriber Y added(receive no uploaded crashes)
+ //
+ // To some degree, keeping the past events is less evil here. Detailed
+ // considerations can be made when the uploads.log behavior is truly
+ // changed.
+ //
+ // Why do we not check that creation_time is later than the current?
+ // -----------------------------------------------------------------
+ //
+ // If the creation time is earlier than the current, it implies that the log
+ // file has been recreated when the system's clock was abnormal. In this
+ // case, what's important here is to know the file has been recreated, not
+ // the actual creation time.
+ uploads_log_info_.byte_location = 0u;
+ uploads_log_info_.offset = 0u;
+ uploads_log_info_.creation_time = creation_time;
+ }
+
+ if (log.value().size() < uploads_log_info_.byte_location) {
+ LOG(ERROR) << "Content read from uploads.log is too short.";
+ return;
+ }
+
+ if (log.value().size() == uploads_log_info_.byte_location) {
+ // No new log content was added to uploads.log since last read.
+ return;
+ }
+
+ uint64_t parsed_bytes;
+ std::vector<mojom::CrashEventInfoPtr> results = ParseUploadsLog(
+ log.value().substr(uploads_log_info_.byte_location), /*is_uploaded=*/true,
+ /*creation_time=*/uploads_log_info_.creation_time,
+ /*init_offset=*/uploads_log_info_.offset,
+ /*parsed_bytes=*/&parsed_bytes);
+
+ if (results.empty()) {
+ // No valid log lines. One possibility is that a new line is partly written
+ // and isn't valid yet. Be conservative and don't modify uploads_log_info_
+ // and do anything else in this case.
+ return;
+ }
+
+ // Rarely, we may have read uploads.log when it is being written. In this
+ // case, the last line may contain only part of an otherwise valid line. To
+ // ensure this last line would be parsed next time, we make sure byte_location
+ // only advances to the end of the final valid log line.
+ uploads_log_info_.byte_location += parsed_bytes;
+ uploads_log_info_.offset += results.size();
+
+ for (const auto& result : results) {
+ for (auto& observer : observers_) {
+ observer->OnEvent(mojom::EventInfo::NewCrashEventInfo(result.Clone()));
+ }
+ }
+
+ past_uploaded_crashes_.insert(past_uploaded_crashes_.end(),
+ std::make_move_iterator(results.begin()),
+ std::make_move_iterator(results.end()));
+}
+
std::vector<mojom::CrashEventInfoPtr> ParseUploadsLog(base::StringPiece log,
bool is_uploaded,
base::Time creation_time,
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events_impl_test.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events_impl_test.cc
index fbc2d02..b5784e3 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events_impl_test.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events_impl_test.cc
@@ -12,17 +12,26 @@
#include <base/strings/strcat.h>
#include <base/strings/string_piece.h>
+#include <base/test/gmock_callback_support.h>
+#include <base/test/repeating_test_future.h>
+#include <base/test/task_environment.h>
#include <brillo/syslog_logging.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
+#include "diagnostics/cros_healthd/events/mock_event_observer.h"
+#include "diagnostics/cros_healthd/mojom/executor.mojom.h"
+#include "diagnostics/cros_healthd/system/mock_context.h"
+
namespace diagnostics {
namespace {
namespace mojom = ash::cros_healthd::mojom;
+using ::testing::_;
using ::testing::HasSubstr;
+using ::testing::NiceMock;
-constexpr uint64_t kInitOffset = 100;
+constexpr uint64_t kInitOffset = 100u;
constexpr char kValidLogLine[] =
R"TEXT({"path_hash":"a_local_id","capture_time":"9876543",)TEXT"
@@ -45,6 +54,10 @@
/*creation_time=*/base::Time(),
/*offset=*/0u));
+constexpr char kUninterestingValidLogLine[] =
+ R"TEXT({"path_hash":"other_local_id","capture_time":"2",)TEXT"
+ R"TEXT("upload_id":"other_crash_report_id"})TEXT";
+
constexpr char kInvalidLogLine[] = "{{{{";
// Tests parsing each valid field outside upload_info.
@@ -338,5 +351,343 @@
EXPECT_TRUE(result[1].Equals(kExpectedUnuploadedResultForValidLogLine));
}
+// Tests for the CrashEvents class.
+class CrashEventsTest : public testing::Test {
+ protected:
+ CrashEventsTest() = default;
+ CrashEventsTest(const CrashEventsTest&) = delete;
+ CrashEventsTest& operator=(const CrashEventsTest&) = delete;
+
+ void SetUp() override {
+ mojo::PendingReceiver<mojom::EventObserver> observer_receiver(
+ remote_observer_.InitWithNewPipeAndPassReceiver());
+ observer_ = std::make_unique<NiceMock<MockEventObserver>>(
+ std::move(observer_receiver));
+ ON_CALL(*mock_observer(), OnEvent(_))
+ .WillByDefault([this](mojom::EventInfoPtr info) {
+ this->received_events_.AddValue(std::move(info));
+ });
+ }
+
+ // Adds an observer of our interest.
+ void AddObserver() { crash_events_.AddObserver(std::move(remote_observer_)); }
+
+ // Adds an observer that we are not interested in checking.
+ void AddUninterestingObserver() {
+ mojo::PendingRemote<mojom::EventObserver> remote_observer;
+ mojo::PendingReceiver<mojom::EventObserver> observer_receiver(
+ remote_observer.InitWithNewPipeAndPassReceiver());
+ uninteresting_observer_ = std::make_unique<NiceMock<MockEventObserver>>(
+ std::move(observer_receiver));
+ crash_events_.AddObserver(std::move(remote_observer));
+ }
+
+ // Advances the clock by one period.
+ void AdvanceClockByOnePeriod() {
+ task_environment_.FastForwardBy(base::Minutes(20));
+ }
+
+ // Sets mock executor's normal crash sender execution response.
+ void SetExecutorCrashSenderNormalResponse(std::string out) {
+ auto response = mojom::ExecutedProcessResult::New();
+ response->return_code = EXIT_SUCCESS;
+ response->out = std::move(out);
+ EXPECT_CALL(*mock_executor(), FetchCrashFromCrashSender(_))
+ .WillOnce(base::test::RunOnceCallback<0>(std::move(response)));
+ }
+
+ // Sets mock executor's empty crash sender execution response.
+ void SetExecutorCrashSenderEmptyResponse() {
+ SetExecutorCrashSenderNormalResponse("");
+ }
+
+ // Sets mock executor's failure crash sender execution response.
+ void SetExecutorCrashSenderFailureResponse() {
+ auto response = mojom::ExecutedProcessResult::New();
+ response->return_code = 1;
+ EXPECT_CALL(*mock_executor(), FetchCrashFromCrashSender(_))
+ .WillOnce(base::test::RunOnceCallback<0>(std::move(response)));
+ }
+
+ // Sets mock executor's reading and getting info from uploads.log.
+ void SetExecutorFileNormalResponse(const std::string& response,
+ base::Time creation_time = base::Time()) {
+ EXPECT_CALL(*mock_executor(), ReadFile(mojom::Executor::File::kCrashLog, _))
+ .WillOnce(base::test::RunOnceCallback<1>(response));
+
+ EXPECT_CALL(*mock_executor(),
+ GetFileInfo(mojom::Executor::File::kCrashLog, _))
+ .WillOnce(base::test::RunOnceCallback<1>(mojom::FileInfo::New(
+ /*creation_time=*/creation_time)));
+ }
+
+ // Sets mock executor's reading empty content from uploads.log.
+ void SetExecutorFileEmptyResponse() { SetExecutorFileNormalResponse(""); }
+
+ // Sets mock executor's failure of getting file info from uploads.log.
+ void SetExecutorFileFailureResponse() {
+ EXPECT_CALL(*mock_executor(),
+ GetFileInfo(mojom::Executor::File::kCrashLog, _))
+ .WillOnce(base::test::RunOnceCallback<1>(nullptr));
+ }
+
+ // Expects the received event.
+ void ExpectReceivedEvent(const mojom::CrashEventInfoPtr& expected_result) {
+ auto received_info = WaitForReceivedEvent();
+ ASSERT_TRUE(received_info->is_crash_event_info())
+ << "Received info is not crash info.";
+ const auto& crash_event_info = received_info->get_crash_event_info();
+ EXPECT_TRUE(crash_event_info.Equals(expected_result))
+ << "Received crash info does not equal the expected result.";
+ }
+
+ // Skips an uninteresting event.
+ void SkipEvent() { WaitForReceivedEvent(); }
+
+ // Expects no event.
+ void ExpectNoEvent() { EXPECT_CALL(*mock_observer(), OnEvent(_)).Times(0); }
+
+ // Waits for the next received event.
+ mojom::EventInfoPtr WaitForReceivedEvent() { return received_events_.Take(); }
+
+ MockEventObserver* mock_observer() { return observer_.get(); }
+ MockExecutor* mock_executor() { return mock_context_.mock_executor(); }
+
+ private:
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
+ MockContext mock_context_;
+ CrashEvents crash_events_{&mock_context_};
+ // Because we don't always EXPECT_CALL `OnEvent` and we need to modify the
+ // behavior of `OnEvent` with `ON_CALL`, we use `NiceMock` here to suppress
+ // uninteresting warnings.
+ std::unique_ptr<NiceMock<MockEventObserver>> observer_;
+ // Although we are uninterested in this observer, we still need to keep it in
+ // memory to keep the observer alive.
+ std::unique_ptr<NiceMock<MockEventObserver>> uninteresting_observer_;
+ mojo::PendingRemote<mojom::EventObserver> remote_observer_;
+ base::test::RepeatingTestFuture<mojom::EventInfoPtr> received_events_;
+};
+
+TEST_F(CrashEventsTest, PeriodicUnuploadedEvents) {
+ AddObserver();
+ SetExecutorCrashSenderNormalResponse(kValidLogLine);
+ SetExecutorFileEmptyResponse();
+ AdvanceClockByOnePeriod();
+ ExpectReceivedEvent(kExpectedUnuploadedResultForValidLogLine);
+}
+
+TEST_F(CrashEventsTest, PeriodicUploadedEvents) {
+ AddObserver();
+ SetExecutorCrashSenderEmptyResponse();
+ SetExecutorFileNormalResponse(kValidLogLine);
+ AdvanceClockByOnePeriod();
+ ExpectReceivedEvent(kExpectedUploadedResultForValidLogLine);
+}
+
+TEST_F(CrashEventsTest, PeriodicUnuploadedEventsIfUploadedFails) {
+ AddObserver();
+ SetExecutorCrashSenderNormalResponse(kValidLogLine);
+ SetExecutorFileFailureResponse();
+ AdvanceClockByOnePeriod();
+ ExpectReceivedEvent(kExpectedUnuploadedResultForValidLogLine);
+}
+
+TEST_F(CrashEventsTest, PeriodicUploadedEventsIfUnuploadedFails) {
+ AddObserver();
+ SetExecutorCrashSenderFailureResponse();
+ SetExecutorFileNormalResponse(kValidLogLine);
+ AdvanceClockByOnePeriod();
+ ExpectReceivedEvent(kExpectedUploadedResultForValidLogLine);
+}
+
+TEST_F(CrashEventsTest, PeriodicUnuploadedBeforeUploadedEvents) {
+ AddObserver();
+ SetExecutorCrashSenderNormalResponse(kValidLogLine);
+ SetExecutorFileNormalResponse(kValidLogLine);
+ AdvanceClockByOnePeriod();
+ ExpectReceivedEvent(kExpectedUnuploadedResultForValidLogLine);
+ ExpectReceivedEvent(kExpectedUploadedResultForValidLogLine);
+}
+
+TEST_F(CrashEventsTest, PeriodicUnuploadedNoDuplicate) {
+ AddObserver();
+ SetExecutorCrashSenderNormalResponse(kValidLogLine);
+ SetExecutorFileEmptyResponse();
+ AdvanceClockByOnePeriod();
+ SkipEvent(); // The first event, skip it as it is not interesting here.
+
+ // Second time, shouldn't receive the same event again.
+ SetExecutorCrashSenderNormalResponse(kValidLogLine);
+ SetExecutorFileEmptyResponse();
+ ExpectNoEvent();
+ AdvanceClockByOnePeriod();
+}
+
+TEST_F(CrashEventsTest, PeriodicUnuploadedSecondDifferentEvent) {
+ AddObserver();
+ SetExecutorCrashSenderNormalResponse(kUninterestingValidLogLine);
+ SetExecutorFileEmptyResponse();
+ AdvanceClockByOnePeriod();
+ SkipEvent(); // The first event, skip it as it is not interesting here.
+
+ // Second time a different additional event is returned. Shouldn't receive the
+ // same event again, but the second event must be received.
+ SetExecutorCrashSenderNormalResponse(kValidLogLine);
+ SetExecutorFileEmptyResponse();
+ AdvanceClockByOnePeriod();
+ ExpectReceivedEvent(kExpectedUnuploadedResultForValidLogLine);
+}
+
+TEST_F(CrashEventsTest, PeriodicUploadedSecondTimeNewEvent) {
+ AddObserver();
+ SetExecutorFileNormalResponse(kUninterestingValidLogLine);
+ SetExecutorCrashSenderEmptyResponse();
+ AdvanceClockByOnePeriod();
+ SkipEvent(); // The first event, skip it as it is not interesting here.
+
+ // Second time, should only receive the second event.
+ SetExecutorFileNormalResponse(
+ base::StrCat({kUninterestingValidLogLine, "\n", kValidLogLine}));
+ SetExecutorCrashSenderEmptyResponse();
+ AdvanceClockByOnePeriod();
+ auto expected_result = kExpectedUploadedResultForValidLogLine.Clone();
+ expected_result->upload_info->offset = 1;
+ ExpectReceivedEvent(expected_result);
+}
+
+TEST_F(CrashEventsTest, PeriodicUploadedSecondTimeNoNewEvent) {
+ AddObserver();
+ SetExecutorFileNormalResponse(kUninterestingValidLogLine);
+ SetExecutorCrashSenderEmptyResponse();
+ AdvanceClockByOnePeriod();
+ SkipEvent(); // The first event, skip it as it is not interesting here.
+
+ // Second time, should receive no event.
+ SetExecutorFileNormalResponse(kUninterestingValidLogLine);
+ SetExecutorCrashSenderEmptyResponse();
+ ExpectNoEvent();
+ AdvanceClockByOnePeriod();
+}
+
+TEST_F(CrashEventsTest, PeriodicUploadedSecondTimeAbnormallyShortUploadsLog) {
+ AddObserver();
+ SetExecutorFileNormalResponse(kUninterestingValidLogLine);
+ SetExecutorCrashSenderEmptyResponse();
+ AdvanceClockByOnePeriod();
+ SkipEvent(); // The first event, skip it as it is not interesting here.
+
+ // Second time, should receive no event. The system should continue working as
+ // normal.
+ SetExecutorFileNormalResponse(
+ std::string(base::StringPiece(kUninterestingValidLogLine))
+ .substr(0, std::size(kUninterestingValidLogLine) / 2));
+ SetExecutorCrashSenderEmptyResponse();
+ ExpectNoEvent();
+ AdvanceClockByOnePeriod();
+}
+
+// When the first time uploads.log contains an incomplete final line, it should
+// be parsed second time when it becomes complete.
+TEST_F(CrashEventsTest, PeriodicUploadedFirstTimePartialLineSecondTimeParsed) {
+ const std::string kCompleteUploadsLog =
+ base::StrCat({kUninterestingValidLogLine, "\n", kValidLogLine});
+ AddObserver();
+ SetExecutorFileNormalResponse(kCompleteUploadsLog.substr(
+ 0u, kCompleteUploadsLog.size() - std::size(kValidLogLine) / 2));
+ SetExecutorCrashSenderEmptyResponse();
+ AdvanceClockByOnePeriod();
+ SkipEvent(); // The first event, skip it as it is not interesting here.
+
+ // Second time, should receive the second event.
+ SetExecutorFileNormalResponse(kCompleteUploadsLog);
+ SetExecutorCrashSenderEmptyResponse();
+ AdvanceClockByOnePeriod();
+ auto expected_result = kExpectedUploadedResultForValidLogLine.Clone();
+ expected_result->upload_info->offset = 1;
+ ExpectReceivedEvent(expected_result);
+}
+
+// Tests when uploads.log is recreated. Parameterize this test to make sure both
+// later and earlier creation time are treated the same. See the comment block
+// "Why do we not check that creation_time is later than the current?"
+class CrashEventsUploadsLogRecreatedTest
+ : public CrashEventsTest,
+ public ::testing::WithParamInterface<base::Time> {
+ public:
+ static constexpr auto kCurrentCreationTime = base::Time::FromTimeT(2);
+
+ protected:
+ base::Time creation_time() { return GetParam(); }
+};
+
+TEST_P(CrashEventsUploadsLogRecreatedTest, PeriodicUploaded) {
+ AddObserver();
+ SetExecutorFileNormalResponse(kValidLogLine, kCurrentCreationTime);
+ SetExecutorCrashSenderEmptyResponse();
+ AdvanceClockByOnePeriod();
+ SkipEvent(); // The first event, skip it as it is not interesting here.
+
+ // Uploads.log recreated, should receive the same event.
+ SetExecutorFileNormalResponse(kValidLogLine, creation_time());
+ SetExecutorCrashSenderEmptyResponse();
+ AdvanceClockByOnePeriod();
+ auto expected_result = kExpectedUploadedResultForValidLogLine.Clone();
+ expected_result->upload_info->creation_time = creation_time();
+ ExpectReceivedEvent(expected_result);
+}
+
+INSTANTIATE_TEST_SUITE_P(
+ VaryingCreationTime,
+ CrashEventsUploadsLogRecreatedTest,
+ testing::Values(CrashEventsUploadsLogRecreatedTest::kCurrentCreationTime -
+ base::Seconds(1),
+ CrashEventsUploadsLogRecreatedTest::kCurrentCreationTime +
+ base::Seconds(1)));
+
+TEST_F(CrashEventsTest, UponSubscriptionUploadedEvents) {
+ // Get one uploaded event in the history and then add the observer of
+ // interest.
+ AddUninterestingObserver();
+ SetExecutorCrashSenderEmptyResponse();
+ SetExecutorFileNormalResponse(kValidLogLine);
+ AdvanceClockByOnePeriod();
+ SetExecutorCrashSenderEmptyResponse();
+ SetExecutorFileEmptyResponse();
+ AddObserver();
+
+ // Should receive this event in the history upon subscription.
+ ExpectReceivedEvent(kExpectedUploadedResultForValidLogLine);
+}
+
+TEST_F(CrashEventsTest, UponSubscriptionUnuploadedEvents) {
+ // Get one unuploaded event in the history and then add the observer of
+ // interest.
+ AddUninterestingObserver();
+ SetExecutorCrashSenderNormalResponse(kValidLogLine);
+ AdvanceClockByOnePeriod();
+ SetExecutorCrashSenderEmptyResponse();
+ SetExecutorFileEmptyResponse();
+ AddObserver();
+
+ // Should receive this event in the history upon subscription.
+ ExpectReceivedEvent(kExpectedUnuploadedResultForValidLogLine);
+}
+
+TEST_F(CrashEventsTest, UponSubscriptionUnuploadedBeforeUploadedEvents) {
+ // Get one unuploaded event in the history and then add the observer of
+ // interest.
+ AddUninterestingObserver();
+ SetExecutorCrashSenderNormalResponse(kValidLogLine);
+ SetExecutorFileNormalResponse(kValidLogLine);
+ AdvanceClockByOnePeriod();
+ SetExecutorCrashSenderEmptyResponse();
+ SetExecutorFileEmptyResponse();
+ AddObserver();
+
+ // Should receive these events in the history upon subscription.
+ ExpectReceivedEvent(kExpectedUnuploadedResultForValidLogLine);
+ ExpectReceivedEvent(kExpectedUploadedResultForValidLogLine);
+}
} // namespace
} // namespace diagnostics
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/executor.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/executor.cc
index b4123bb..a6c2233 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/executor.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/executor.cc
@@ -151,6 +151,8 @@
base::FilePath FileEnumToFilePath(mojom::Executor::File file_enum) {
switch (file_enum) {
+ case mojom::Executor::File::kCrashLog:
+ return base::FilePath{"/var/log/chrome/Crash Reports/uploads.log"};
// Path to the UEFI SecureBoot file. This file can be read by root only.
// It's one of EFI globally defined variables (EFI_GLOBAL_VARIABLE, fixed
// UUID 8be4df61-93ca-11d2-aa0d-00e098032b8c) See also:
@@ -267,6 +269,8 @@
Executor::~Executor() = default;
+// TODO(b/266018436): Improve this function to support reading only part of a
+// file.
void Executor::ReadFile(File file_enum, ReadFileCallback callback) {
base::FilePath file = FileEnumToFilePath(file_enum);
std::string content = "";
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/system/ground_truth.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/system/ground_truth.cc
index 44e7f88..e138972 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/system/ground_truth.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/system/ground_truth.cc
@@ -57,6 +57,7 @@
case mojom::EventCategoryEnum::kBluetooth:
case mojom::EventCategoryEnum::kPower:
case mojom::EventCategoryEnum::kAudio:
+ case mojom::EventCategoryEnum::kCrash:
return mojom::SupportStatus::NewSupported(mojom::Supported::New());
// Need to be determined by boxster/cros_config.
case mojom::EventCategoryEnum::kKeyboardDiagnostic:
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/assert.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/assert.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/assert.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/assert.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/ctype.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/ctype.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/ctype.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/ctype.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/endian.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/endian.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/endian.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/endian.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/inttypes.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/inttypes.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/inttypes.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/inttypes.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/limits.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/limits.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/limits.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/limits.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/math.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/math.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/math.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/math.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/stdbool.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/stdbool.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/stdbool.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/stdbool.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/stddef.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/stddef.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/stddef.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/stddef.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/stdint.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/stdint.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/stdint.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/stdint.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/stdio.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/stdio.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/stdio.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/stdio.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/stdlib.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/stdlib.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/stdlib.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/stdlib.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/string.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/string.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/string.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/string.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/strings.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/strings.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/strings.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/strings.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/sys/time.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/sys/time.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/sys/time.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/sys/time.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/sys/types.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/sys/types.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/sys/types.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/sys/types.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/time.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/time.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/builtin/time.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/builtin/time.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/chip/host/reboot.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/chip/host/reboot.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/chip/host/reboot.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/chip/host/reboot.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/chip/ish/system_state.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/chip/ish/system_state.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/chip/ish/system_state.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/chip/ish/system_state.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/chip/mt_scp/rv32i_common/cache.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/chip/mt_scp/rv32i_common/cache.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/chip/mt_scp/rv32i_common/cache.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/chip/mt_scp/rv32i_common/cache.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/common/spi/flash_reg/private/common.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/common/spi/flash_reg/private/common.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/common/spi/flash_reg/private/common.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/common/spi/flash_reg/private/common.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/common/spi/flash_reg/private/util.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/common/spi/flash_reg/private/util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/common/spi/flash_reg/private/util.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/common/spi/flash_reg/private/util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/cortex-m/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/cortex-m/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/cortex-m/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/cortex-m/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/cortex-m/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/cortex-m/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/cortex-m/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/cortex-m/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/cortex-m0/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/cortex-m0/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/cortex-m0/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/cortex-m0/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/cortex-m0/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/cortex-m0/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/cortex-m0/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/cortex-m0/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/host/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/host/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/host/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/host/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/host/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/host/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/host/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/host/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/minute-ia/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/minute-ia/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/minute-ia/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/minute-ia/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/minute-ia/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/minute-ia/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/minute-ia/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/minute-ia/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/nds32/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/nds32/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/nds32/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/nds32/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/nds32/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/nds32/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/nds32/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/nds32/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/riscv-rv32i/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/riscv-rv32i/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/riscv-rv32i/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/riscv-rv32i/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/riscv-rv32i/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/riscv-rv32i/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/core/riscv-rv32i/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/core/riscv-rv32i/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/driver/sync.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/driver/sync.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/driver/sync.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/driver/sync.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/fuzz/span.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/fuzz/span.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/fuzz/span.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/fuzz/span.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/audio_codec.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/audio_codec.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/audio_codec.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/audio_codec.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/benchmark.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/benchmark.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/benchmark.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/benchmark.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/byteorder.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/byteorder.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/byteorder.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/byteorder.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/clock.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/clock.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/clock.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/clock.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/common.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/common.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/common.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/common.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/compiler.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/compiler.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/compiler.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/compiler.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/config.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/config.h
similarity index 99%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/config.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/config.h
index fb492a6..dc7c64f 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/config.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/config.h
@@ -470,6 +470,11 @@
*/
#undef CONFIG_BATTERY
+/**
+ * Enable Battery-info-in-CBI. It allows a board to read battery info from CBI.
+ */
+#undef CONFIG_BATTERY_INFO_IN_CBI
+
/*
* Config to indicate the battery type that cannot be auto detected.
*/
@@ -1611,6 +1616,7 @@
#undef CONFIG_CMD_BATDEBUG
#define CONFIG_CMD_BATTFAKE
#undef CONFIG_CMD_BATT_MFG_ACCESS
+#undef CONFIG_CMD_BATTERY_INFO_IN_CBI
#undef CONFIG_CMD_BUTTON
#define CONFIG_CMD_CBI
#undef CONFIG_CMD_PD_SRCCAPS_REDUCED_SIZE
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/crc.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/crc.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/crc.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/crc.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/device_event.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/device_event.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/device_event.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/device_event.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/ec_commands.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/ec_commands.h
similarity index 99%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/ec_commands.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/ec_commands.h
index 03432dc..ebab28b 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/ec_commands.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/ec_commands.h
@@ -6162,6 +6162,40 @@
CBI_TAG_SSFC = 8, /* uint32_t bit field */
CBI_TAG_REWORK_ID = 9, /* uint64_t or smaller */
CBI_TAG_FACTORY_CALIBRATION_DATA = 10, /* uint32_t bit field */
+ /*
+ * Battery info
+ */
+ /* struct fuel_gauge_info */
+ CBI_TAG_FUEL_GAUGE_MANUF_NAME,
+ CBI_TAG_FUEL_GAUGE_DEVICE_NAME,
+ CBI_TAG_FUEL_GAUGE_FLAGS,
+ /* struct ship_mod_info */
+ CBI_TAG_BATT_SHIP_MODE_REG_ADDR,
+ CBI_TAG_BATT_SHIP_MODE_REG_DATA,
+ CBI_TAG_BATT_SHIP_MODE_FLAGS, /* enum ship_mode_flag */
+ /* struct sleep_mode_info */
+ CBI_TAG_BATT_SLEEP_MODE_REG_ADDR,
+ CBI_TAG_BATT_SLEEP_MODE_REG_DATA,
+ CBI_TAG_BATT_SLEEP_MODE_FLAGS, /* enum sleep_mode_flag */
+ /* struct fet_info */
+ CBI_TAG_BATT_FET_REG_ADDR,
+ CBI_TAG_BATT_FET_REG_MASK,
+ CBI_TAG_BATT_FET_DISCONNECT_VAL,
+ CBI_TAG_BATT_FET_CFET_MASK,
+ CBI_TAG_BATT_FET_CFET_OFF_VAL,
+ CBI_TAG_BATT_FET_FLAGS, /* enum batt_fet_flag */
+ /* struct battery_info */
+ CBI_TAG_BATT_VOLTAGE_MAX,
+ CBI_TAG_BATT_VOLTAGE_NORMAL,
+ CBI_TAG_BATT_VOLTAGE_MIN,
+ CBI_TAG_BATT_PRECHARGE_VOLTAGE,
+ CBI_TAG_BATT_PRECHARGE_CURRENT,
+ CBI_TAG_BATT_START_CHARGING_MIN_C,
+ CBI_TAG_BATT_START_CHARGING_MAX_C,
+ CBI_TAG_BATT_CHARGING_MIN_C,
+ CBI_TAG_BATT_CHARGING_MAX_C,
+ CBI_TAG_BATT_DISCHARGING_MIN_C,
+ CBI_TAG_BATT_DISCHARGING_MAX_C,
CBI_TAG_COUNT,
};
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/i2c.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/i2c.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/i2c.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/i2c.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/mkbp_event.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/mkbp_event.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/mkbp_event.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/mkbp_event.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/mock/timer_mock.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/mock/timer_mock.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/mock/timer_mock.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/mock/timer_mock.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/panic_defs.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/panic_defs.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/panic_defs.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/panic_defs.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/queue.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/queue.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/queue.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/queue.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/rgb_keyboard.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/rgb_keyboard.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/rgb_keyboard.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/rgb_keyboard.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/rsa.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/rsa.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/rsa.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/rsa.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/rtc.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/rtc.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/rtc.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/rtc.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/sha1.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/sha1.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/sha1.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/sha1.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/stack_trace.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/stack_trace.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/stack_trace.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/stack_trace.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/system.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/system.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/system.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/system.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/task.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/task.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/task.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/task.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/test_util.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/test_util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/test_util.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/test_util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/timer.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/timer.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/timer.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/timer.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/util.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/util.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/watchdog.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/watchdog.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/include/watchdog.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/include/watchdog.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/test/aes.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/test/aes.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/test/aes.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/test/aes.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/test/benchmark.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/test/benchmark.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/test/benchmark.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/test/benchmark.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/test/genvif/src/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/test/genvif/src/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/test/genvif/src/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/test/genvif/src/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/test/genvif/src/timer.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/test/genvif/src/timer.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/test/genvif/src/timer.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/test/genvif/src/timer.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/test/timer.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/test/timer.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/test/timer.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/test/timer.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/third_party/zephyr/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/third_party/zephyr/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/third_party/zephyr/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/third_party/zephyr/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/util/cros_ec_dev.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/util/cros_ec_dev.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/util/cros_ec_dev.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/util/cros_ec_dev.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/util/uut/main.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/util/uut/main.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/util/uut/main.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/util/uut/main.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/include/dt-bindings/motionsense/utils.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/include/dt-bindings/motionsense/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/include/dt-bindings/motionsense/utils.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/include/dt-bindings/motionsense/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/include/emul/utils.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/include/emul/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/include/emul/utils.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/include/emul/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/shim/include/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/shim/include/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/shim/include/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/shim/include/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/shim/include/builtin/assert.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/shim/include/builtin/assert.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/shim/include/builtin/assert.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/shim/include/builtin/assert.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/shim/include/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/shim/include/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/shim/include/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/shim/include/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/shim/include/i2c/i2c.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/shim/include/i2c/i2c.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/shim/include/i2c/i2c.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/shim/include/i2c/i2c.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/shim/include/usbc/utils.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/shim/include/usbc/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/shim/include/usbc/utils.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/shim/include/usbc/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/stubs.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/stubs.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/stubs.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/stubs.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/utils.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/utils.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/test/uart_printf/include/common.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/test/uart_printf/include/common.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/test/uart_printf/include/common.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/test/uart_printf/include/common.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/test/uart_printf/src/main.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/test/uart_printf/src/main.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15074/work/ec-utils-0.0.2/zephyr/test/uart_printf/src/main.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15076/work/ec-utils-0.0.2/zephyr/test/uart_printf/src/main.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/missive-9999/work/missive-9999/platform2/missive/missive/missive_args.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/missive-9999/work/missive-9999/platform2/missive/missive/missive_args.cc
index 1396814..9c916e8 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/missive-9999/work/missive-9999/platform2/missive/missive/missive_args.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/missive-9999/work/missive-9999/platform2/missive/missive/missive_args.cc
@@ -108,17 +108,17 @@
void MissiveArgs::OnParamResultInitially(
feature::PlatformFeaturesInterface::ParamsResult result) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK(!responded_) << "Can only be called once";
- responded_ = true;
- OnParamResult(result);
-
- // Now enable listening for the future updates.
- EnableListeningForUpdates();
+ // Enable listening for the future updates and deliver result after that.
+ EnableListeningForUpdates(base::BindOnce(&MissiveArgs::OnParamResult,
+ weak_ptr_factory_.GetWeakPtr(),
+ std::move(result)));
}
void MissiveArgs::OnParamResult(
feature::PlatformFeaturesInterface::ParamsResult result) {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
// Update the parameters.
UpdateParameters(result);
for (auto& cb : delayed_response_cbs_) {
@@ -132,9 +132,9 @@
}
}
-void MissiveArgs::EnableListeningForUpdates() {
+void MissiveArgs::EnableListeningForUpdates(base::OnceClosure done_cb) {
feature_lib_->ListenForRefetchNeeded(
- base::BindRepeating(
+ /*signal_callback=*/base::BindRepeating(
[](base::WeakPtr<MissiveArgs> self) {
if (!self) {
return;
@@ -147,18 +147,25 @@
base::BindOnce(&MissiveArgs::OnParamResult, self)));
},
weak_ptr_factory_.GetWeakPtr()),
- base::BindOnce(
- [](base::WeakPtr<MissiveArgs> self, bool success) {
+ /*attached_callback=*/base::BindOnce(
+ [](base::WeakPtr<MissiveArgs> self, base::OnceClosure done_cb,
+ bool success) {
if (!self) {
+ std::move(done_cb).Run();
return;
}
DCHECK_CALLED_ON_VALID_SEQUENCE(self->sequence_checker_);
if (!success) {
// Retry if failed to listen.
- self->EnableListeningForUpdates();
+ self->EnableListeningForUpdates(std::move(done_cb));
+ return;
}
+ // Succeeded.
+ DCHECK(!self->responded_) << "Can only be called once";
+ self->responded_ = true;
+ std::move(done_cb).Run();
},
- weak_ptr_factory_.GetWeakPtr()));
+ weak_ptr_factory_.GetWeakPtr(), std::move(done_cb)));
}
void MissiveArgs::UpdateParameters(
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/missive-9999/work/missive-9999/platform2/missive/missive/missive_args.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/missive-9999/work/missive-9999/platform2/missive/missive/missive_args.h
index d620930..259b7db 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/missive-9999/work/missive-9999/platform2/missive/missive/missive_args.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/missive-9999/work/missive-9999/platform2/missive/missive/missive_args.h
@@ -99,7 +99,7 @@
void UpdateParameters(
feature::PlatformFeaturesInterface::ParamsResult result);
- void EnableListeningForUpdates();
+ void EnableListeningForUpdates(base::OnceClosure done_cb);
const std::unique_ptr<feature::PlatformFeaturesInterface> feature_lib_;
diff --git a/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3066/work/adhd-0.0.7/cras/src/common/array.h b/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3070/work/adhd-0.0.7/cras/src/common/array.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3066/work/adhd-0.0.7/cras/src/common/array.h
rename to chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3070/work/adhd-0.0.7/cras/src/common/array.h
diff --git a/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3066/work/adhd-0.0.7/cras/src/common/byte_buffer.h b/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3070/work/adhd-0.0.7/cras/src/common/byte_buffer.h
similarity index 97%
rename from chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3066/work/adhd-0.0.7/cras/src/common/byte_buffer.h
rename to chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3070/work/adhd-0.0.7/cras/src/common/byte_buffer.h
index 3188359..41082e9 100644
--- a/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3066/work/adhd-0.0.7/cras/src/common/byte_buffer.h
+++ b/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3070/work/adhd-0.0.7/cras/src/common/byte_buffer.h
@@ -22,8 +22,7 @@
// Create a byte buffer to hold buffer_size_bytes worth of data.
static inline struct byte_buffer* byte_buffer_create(size_t buffer_size_bytes) {
struct byte_buffer* buf;
- buf = (struct byte_buffer*)calloc(
- 1, sizeof(struct byte_buffer) + buffer_size_bytes);
+ buf = (struct byte_buffer*)calloc(1, sizeof(*buf) + buffer_size_bytes);
if (!buf) {
return buf;
}
diff --git a/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3066/work/adhd-0.0.7/cras/src/server/config/config_test.cc b/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3070/work/adhd-0.0.7/cras/src/server/config/config_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3066/work/adhd-0.0.7/cras/src/server/config/config_test.cc
rename to chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3070/work/adhd-0.0.7/cras/src/server/config/config_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3066/work/adhd-0.0.7/cras/src/tests/metrics_stub.cc b/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3070/work/adhd-0.0.7/cras/src/tests/metrics_stub.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3066/work/adhd-0.0.7/cras/src/tests/metrics_stub.cc
rename to chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3070/work/adhd-0.0.7/cras/src/tests/metrics_stub.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3066/work/adhd-0.0.7/cras/src/tests/test_util.cc b/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3070/work/adhd-0.0.7/cras/src/tests/test_util.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3066/work/adhd-0.0.7/cras/src/tests/test_util.cc
rename to chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3070/work/adhd-0.0.7/cras/src/tests/test_util.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3066/work/adhd-0.0.7/cras/src/tests/test_util.h b/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3070/work/adhd-0.0.7/cras/src/tests/test_util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3066/work/adhd-0.0.7/cras/src/tests/test_util.h
rename to chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3070/work/adhd-0.0.7/cras/src/tests/test_util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/gatt/database.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/gatt/database.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/gatt/database.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/gatt/database.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/le_audio/client.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/le_audio/client.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/le_audio/client.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/le_audio/client.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector_test.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector_test.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/vc/device.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/vc/device.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/vc/device.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/vc/device.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/vc/types.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/vc/types.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/bta/vc/types.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/bta/vc/types.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/btcore/include/property.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/btcore/include/property.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/btcore/include/property.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/btcore/include/property.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/btcore/include/version.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/btcore/include/version.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/btcore/include/version.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/btcore/include/version.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/btcore/src/property.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/btcore/src/property.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/btcore/src/property.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/btcore/src/property.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/common/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/common/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/common/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/common/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/common/metrics.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/common/metrics.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/common/metrics.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/common/metrics.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/common/time_util.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/common/time_util.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/common/time_util.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/common/time_util.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/common/time_util.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/common/time_util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/common/time_util.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/common/time_util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/common/utils.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/common/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/common/utils.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/common/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/device/include/controller.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/device/include/controller.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/device/include/controller.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/device/include/controller.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/device/src/controller.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/device/src/controller.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/device/src/controller.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/device/src/controller.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/bits.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/bits.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/bits.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/bits.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/common.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/common.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/common.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/common.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/fastmath.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/fastmath.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/fastmath.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/fastmath.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/benchmark.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/benchmark.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/benchmark.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/benchmark.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/common/bind.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/common/bind.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/common/bind.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/common/bind.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/common/callback.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/common/callback.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/common/callback.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/common/callback.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/common/callback_list.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/common/callback_list.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/common/callback_list.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/common/callback_list.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/common/lru_cache.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/common/lru_cache.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/common/lru_cache.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/common/lru_cache.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/common/numbers.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/common/numbers.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/common/numbers.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/common/numbers.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/common/strings.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/common/strings.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/common/strings.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/common/strings.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/bundler/main.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/bundler/main.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/bundler/main.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/bundler/main.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/filter.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/filter.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/filter.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/filter.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/hci/address.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/hci/address.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/hci/address.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/hci/address.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/hci/controller_test.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/hci/controller_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/hci/controller_test.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/hci/controller_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/receiver.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/receiver.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/receiver.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/receiver.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/scheduler.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/scheduler.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/scheduler.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/scheduler.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/sender.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/sender.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/sender.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/sender.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/linux/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/linux/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/linux/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/linux/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/metrics.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/metrics.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/metrics.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/metrics.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/alarm.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/alarm.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/alarm.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/alarm.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/android/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/android/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/android/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/android/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/android/system_properties.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/android/system_properties.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/android/system_properties.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/android/system_properties.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/system_properties.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/system_properties.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/system_properties.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/system_properties.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/host/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/host/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/host/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/host/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/host/system_properties.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/host/system_properties.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/host/system_properties.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/host/system_properties.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/linux/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/linux/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/linux/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/linux/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/linux/system_properties.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/linux/system_properties.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/linux/system_properties.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/linux/system_properties.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/linux_generic/thread.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/linux_generic/thread.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/linux_generic/thread.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/linux_generic/thread.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/metrics.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/metrics.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/metrics.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/metrics.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/queue.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/queue.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/queue.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/queue.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/rand.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/rand.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/rand.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/rand.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/syslog.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/syslog.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/syslog.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/syslog.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/system_properties.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/system_properties.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/system_properties.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/system_properties.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/thread.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/thread.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/thread.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/thread.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/utils.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/os/utils.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/os/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/packet/iterator.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/packet/iterator.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/packet/iterator.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/packet/iterator.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/logging.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/logging.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/logging.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/logging.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/main.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/main.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/main.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/main.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/size.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/size.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/size.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/size.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/util.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/util.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/rust/shim/callbacks/callbacks.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/rust/shim/callbacks/callbacks.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/rust/shim/callbacks/callbacks.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/rust/shim/callbacks/callbacks.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/storage/device.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/storage/device.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/storage/device.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/storage/device.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/storage/device.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/storage/device.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/storage/device.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/storage/device.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/storage/device_test.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/storage/device_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/storage/device_test.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/storage/device_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module_test.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module_test.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/include/array_utils.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/include/array_utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/include/array_utils.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/include/array_utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/include/check.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/include/check.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/include/check.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/include/check.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/include/notreached.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/include/notreached.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/include/notreached.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/include/notreached.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/linux_include/log/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/linux_include/log/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/linux_include/log/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/linux_include/log/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/main/shim/config.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/main/shim/config.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/main/shim/config.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/main/shim/config.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/main/shim/config.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/main/shim/config.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/main/shim/config.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/main/shim/config.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/main/shim/controller.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/main/shim/controller.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/main/shim/controller.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/main/shim/controller.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/main/shim/controller.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/main/shim/controller.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/main/shim/controller.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/main/shim/controller.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/main/shim/helpers.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/main/shim/helpers.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/main/shim/helpers.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/main/shim/helpers.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/main/shim/stack.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/main/shim/stack.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/main/shim/stack.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/main/shim/stack.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/alarm.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/alarm.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/alarm.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/alarm.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/allocator.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/allocator.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/allocator.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/allocator.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/array.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/array.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/array.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/array.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/buffer.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/buffer.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/buffer.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/buffer.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/config.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/config.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/config.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/config.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/future.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/future.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/future.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/future.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/list.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/list.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/list.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/list.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/mutex.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/mutex.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/mutex.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/mutex.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/socket.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/socket.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/socket.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/socket.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/socket_utils/sockets.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/socket_utils/sockets.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/socket_utils/sockets.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/socket_utils/sockets.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/thread.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/thread.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include/thread.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include/thread.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include_internal/osi/semaphore.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include_internal/osi/semaphore.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/include_internal/osi/semaphore.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/include_internal/osi/semaphore.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/src/buffer.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/src/buffer.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/src/buffer.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/src/buffer.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/src/config.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/src/config.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/src/config.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/src/config.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/src/future.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/src/future.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/src/future.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/src/future.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/src/socket.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/src/socket.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/src/socket.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/src/socket.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/src/thread.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/src/thread.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/src/thread.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/src/thread.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/test/config_test.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/test/config_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/test/config_test.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/test/config_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/test/future_test.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/test/future_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/osi/test/future_test.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/osi/test/future_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/packet/base/iterator.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/packet/base/iterator.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/packet/base/iterator.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/packet/base/iterator.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/rust/src/core/ffi/types.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/rust/src/core/ffi/types.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/rust/src/core/ffi/types.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/rust/src/core/ffi/types.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/interface.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/interface.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/interface.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/interface.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/main.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/main.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/main.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/main.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/property.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/property.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/property.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/property.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/property.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/property.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/property.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/property.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/util.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/util.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/util.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/util.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/util.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/headless/util.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/headless/util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/rootcanal/service.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/rootcanal/service.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/test/rootcanal/service.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/test/rootcanal/service.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/vendor_libs/linux/interface/service.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/vendor_libs/linux/interface/service.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/system/vendor_libs/linux/interface/service.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/system/vendor_libs/linux/interface/service.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/emulator/include/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/emulator/include/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/emulator/include/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/emulator/include/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/crypto/crypto.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/crypto/crypto.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/crypto/crypto.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/crypto/crypto.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/hci/address.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/hci/address.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/hci/address.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/hci/address.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/os/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/os/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/os/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/os/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/pcap.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/pcap.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/pcap.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/pcap.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/lib/crypto/crypto.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/lib/crypto/crypto.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/lib/crypto/crypto.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/lib/crypto/crypto.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/test/controller/le/test_helpers.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/test/controller/le/test_helpers.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/bt/tools/rootcanal/test/controller/le/test_helpers.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/bt/tools/rootcanal/test/controller/le/test_helpers.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/common-mk/example/component/component.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/common-mk/example/component/component.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/common-mk/example/component/component.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/common-mk/example/component/component.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/common-mk/example/include/component/component.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/common-mk/example/include/component/component.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/common-mk/example/include/component/component.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/common-mk/example/include/component/component.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/common-mk/testrunner.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/common-mk/testrunner.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/common-mk/testrunner.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/common-mk/testrunner.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/common-mk/testrunner.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/common-mk/testrunner.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/common-mk/testrunner.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/common-mk/testrunner.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/external/proto_logging/stats/stats_log_api_gen/utils.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/external/proto_logging/stats/stats_log_api_gen/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3732/work/floss-0.0.2/platform2/external/proto_logging/stats/stats_log_api_gen/utils.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3736/work/floss-0.0.2/platform2/external/proto_logging/stats/stats_log_api_gen/utils.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared-internal.h b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared-internal.h
index 8331846..06dc69a 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared-internal.h
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared-internal.h
@@ -96,6 +96,7 @@
case 0:
case 1:
case 2:
+ case 3:
return true;
}
return false;
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.cc b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.cc
index 02892d2..e1b4f2d 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.cc
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.cc
@@ -76,6 +76,8 @@
NOINLINE static const char* Executor_FileToStringHelper(Executor_File value) {
// Defined in a helper function to ensure that Clang generates a lookup table.
switch(value) {
+ case Executor_File::kCrashLog:
+ return "kCrashLog";
case Executor_File::kUEFISecureBootVariable:
return "kUEFISecureBootVariable";
case Executor_File::kUEFIPlatformSize:
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.h b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.h
index 7b817f6..e5eadbd 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.h
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.h
@@ -157,13 +157,15 @@
enum class Executor_File : int32_t {
- kUEFISecureBootVariable = 0,
+ kCrashLog = 0,
- kUEFIPlatformSize = 1,
+ kUEFISecureBootVariable = 1,
- kWirelessPowerScheme = 2,
+ kUEFIPlatformSize = 2,
+
+ kWirelessPowerScheme = 3,
kMinValue = 0,
- kMaxValue = 2,
+ kMaxValue = 3,
};
std::ostream& operator<<(std::ostream& os, Executor_File value);
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared-internal.h b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared-internal.h
index 33ef964..e89c74b 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared-internal.h
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared-internal.h
@@ -102,6 +102,7 @@
case 13:
case 14:
case 15:
+ case 16:
return true;
}
return false;
@@ -655,6 +656,8 @@
kStylusGarageEventInfo,
kStylusEventInfo,
+
+ kCrashEventInfo,
};
// A note on layout:
@@ -677,6 +680,7 @@
mojo::internal::Pointer<internal::TouchscreenEventInfo_Data> f_touchscreen_event_info;
mojo::internal::Pointer<internal::StylusGarageEventInfo_Data> f_stylus_garage_event_info;
mojo::internal::Pointer<internal::StylusEventInfo_Data> f_stylus_event_info;
+ mojo::internal::Pointer<internal::CrashEventInfo_Data> f_crash_event_info;
uint64_t unknown;
};
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.cc b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.cc
index 0294094..84e1cb3 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.cc
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.cc
@@ -86,6 +86,8 @@
return "kStylusGarage";
case EventCategoryEnum::kStylus:
return "kStylus";
+ case EventCategoryEnum::kCrash:
+ return "kCrash";
default:
return nullptr;
}
@@ -787,6 +789,16 @@
return false;
return true;
}
+ case EventInfo_Tag::kCrashEventInfo: {
+
+ if (!mojo::internal::ValidatePointerNonNullable(
+ object->data.f_crash_event_info, 16, validation_context)) {
+ return false;
+ }
+ if (!mojo::internal::ValidateStruct(object->data.f_crash_event_info, validation_context))
+ return false;
+ return true;
+ }
default: {
return true;
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.h b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.h
index 80881e5..4a7d93b 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.h
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.h
@@ -338,8 +338,10 @@
kStylusGarage = 14,
kStylus = 15,
+
+ kCrash = 16,
kMinValue = 0,
- kMaxValue = 15,
+ kMaxValue = 16,
kDefaultValue = 0
};
@@ -1856,6 +1858,17 @@
return mojo::internal::Deserialize<::ash::cros_healthd::mojom::StylusEventInfoDataView>(
data_->data.f_stylus_event_info.Get(), output, message_);
}
+ bool is_crash_event_info() const { return data_->tag == Tag::kCrashEventInfo; }
+ inline void GetCrashEventInfoDataView(
+ CrashEventInfoDataView* output) const;
+
+ template <typename UserType>
+ [[nodiscard]] bool ReadCrashEventInfo(UserType* output) const {
+
+ CHECK(is_crash_event_info());
+ return mojo::internal::Deserialize<::ash::cros_healthd::mojom::CrashEventInfoDataView>(
+ data_->data.f_crash_event_info.Get(), output, message_);
+ }
private:
internal::EventInfo_Data* data_ = nullptr;
@@ -3555,6 +3568,22 @@
value_fragment.is_null() ? nullptr : value_fragment.data());
break;
}
+ case ::ash::cros_healthd::mojom::EventInfoDataView::Tag::kCrashEventInfo: {
+ decltype(Traits::crash_event_info(input))
+ in_crash_event_info = Traits::crash_event_info(input);
+ mojo::internal::MessageFragment<
+ typename decltype(fragment->data.f_crash_event_info)::BaseType>
+ value_fragment(fragment.message());
+ mojo::internal::Serialize<::ash::cros_healthd::mojom::CrashEventInfoDataView>(
+ in_crash_event_info, value_fragment);
+ MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING(
+ value_fragment.is_null(),
+ mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER,
+ "null crash_event_info in EventInfo union");
+ fragment->data.f_crash_event_info.Set(
+ value_fragment.is_null() ? nullptr : value_fragment.data());
+ break;
+ }
}
}
@@ -3814,6 +3843,11 @@
CHECK(is_stylus_event_info());
*output = StylusEventInfoDataView(data_->data.f_stylus_event_info.Get(), message_);
}
+inline void EventInfoDataView::GetCrashEventInfoDataView(
+ CrashEventInfoDataView* output) const {
+ CHECK(is_crash_event_info());
+ *output = CrashEventInfoDataView(data_->data.f_crash_event_info.Get(), message_);
+}
} // namespace mojom
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.cc b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.cc
index 4519d51..25bbcce 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.cc
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.cc
@@ -1404,6 +1404,17 @@
std::move(stylus_event_info));
}
}
+void EventInfo::set_crash_event_info(
+ CrashEventInfoPtr crash_event_info) {
+ if (tag_ == Tag::kCrashEventInfo) {
+ *(data_.crash_event_info) = std::move(crash_event_info);
+ } else {
+ DestroyActive();
+ tag_ = Tag::kCrashEventInfo;
+ data_.crash_event_info = new CrashEventInfoPtr(
+ std::move(crash_event_info));
+ }
+}
void EventInfo::DestroyActive() {
switch (tag_) {
@@ -1467,6 +1478,10 @@
delete data_.stylus_event_info;
break;
+ case Tag::kCrashEventInfo:
+
+ delete data_.crash_event_info;
+ break;
}
}
@@ -4488,6 +4503,15 @@
std::move(result_stylus_event_info));
break;
}
+ case Tag::kCrashEventInfo: {
+ ::ash::cros_healthd::mojom::CrashEventInfoPtr result_crash_event_info;
+ if (!input.ReadCrashEventInfo(&result_crash_event_info))
+ return false;
+
+ *output = UnionType::NewCrashEventInfo(
+ std::move(result_crash_event_info));
+ break;
+ }
default:
*output = UnionType::NewDefaultType({});
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.h b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.h
index 3bdc877..6db7a96 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.h
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/diagnostics/out/Default/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.h
@@ -3224,6 +3224,14 @@
result->set_stylus_event_info(std::move(stylus_event_info));
return result;
}
+ // Construct an instance holding |crash_event_info|.
+ static EventInfoPtr
+ NewCrashEventInfo(
+ CrashEventInfoPtr crash_event_info) {
+ auto result = EventInfoPtr(absl::in_place);
+ result->set_crash_event_info(std::move(crash_event_info));
+ return result;
+ }
template <typename U>
static EventInfoPtr From(const U& u) {
@@ -3446,6 +3454,18 @@
void set_stylus_event_info(
StylusEventInfoPtr stylus_event_info);
+
+ bool is_crash_event_info() const { return tag_ == Tag::kCrashEventInfo; }
+
+
+ CrashEventInfoPtr& get_crash_event_info() const {
+ CHECK(tag_ == Tag::kCrashEventInfo);
+ return *(data_.crash_event_info);
+ }
+
+
+ void set_crash_event_info(
+ CrashEventInfoPtr crash_event_info);
template <typename UserType>
static mojo::Message SerializeAsMessage(UserType* input) {
@@ -3479,6 +3499,7 @@
TouchscreenEventInfoPtr* touchscreen_event_info;
StylusGarageEventInfoPtr* stylus_garage_event_info;
StylusEventInfoPtr* stylus_event_info;
+ CrashEventInfoPtr* crash_event_info;
};
static bool Validate(const void* data,
@@ -5145,6 +5166,9 @@
case Tag::kStylusEventInfo:
return NewStylusEventInfo(
mojo::Clone(*data_.stylus_event_info));
+ case Tag::kCrashEventInfo:
+ return NewCrashEventInfo(
+ mojo::Clone(*data_.crash_event_info));
}
return nullptr;
}
@@ -5187,6 +5211,8 @@
return mojo::Equals(*(data_.stylus_garage_event_info), *(other.data_.stylus_garage_event_info));
case Tag::kStylusEventInfo:
return mojo::Equals(*(data_.stylus_event_info), *(other.data_.stylus_event_info));
+ case Tag::kCrashEventInfo:
+ return mojo::Equals(*(data_.crash_event_info), *(other.data_.crash_event_info));
}
return false;
@@ -6453,6 +6479,10 @@
return input->get_stylus_event_info();
}
+ static const ::ash::cros_healthd::mojom::CrashEventInfoPtr& crash_event_info(const ::ash::cros_healthd::mojom::EventInfoPtr& input) {
+ return input->get_crash_event_info();
+ }
+
static bool Read(::ash::cros_healthd::mojom::EventInfo::DataView input, ::ash::cros_healthd::mojom::EventInfoPtr* output);
};
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/bindings/python/google_benchmark/benchmark.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/bindings/python/google_benchmark/benchmark.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/bindings/python/google_benchmark/benchmark.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/bindings/python/google_benchmark/benchmark.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/include/benchmark/benchmark.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/include/benchmark/benchmark.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/include/benchmark/benchmark.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/include/benchmark/benchmark.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/include/benchmark/export.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/include/benchmark/export.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/include/benchmark/export.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/include/benchmark/export.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/benchmark.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/benchmark.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/benchmark.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/benchmark.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/check.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/check.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/check.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/check.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/check.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/check.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/check.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/check.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/log.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/log.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/log.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/log.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/mutex.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/mutex.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/mutex.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/mutex.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/reporter.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/reporter.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/reporter.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/reporter.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/string_util.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/string_util.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/string_util.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/string_util.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/string_util.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/string_util.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/src/string_util.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/src/string_util.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/test/benchmark_test.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/test/benchmark_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/com_github_google_benchmark/test/benchmark_test.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/com_github_google_benchmark/test/benchmark_test.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/ijar/common.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/ijar/common.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/ijar/common.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/ijar/common.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/errors.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/errors.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/errors.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/errors.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/file.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/file.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/file.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/file.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/file.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/file.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/file.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/file.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/file_posix.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/file_posix.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/file_posix.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/file_posix.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/logging.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/logging.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/logging.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/logging.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/logging.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/logging.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/logging.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/logging.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/md5.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/md5.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/md5.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/md5.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/path.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/path.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/path.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/path.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/port.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/port.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/port.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/port.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/port.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/port.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/port.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/port.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/strings.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/strings.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/cpp/util/strings.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/cpp/util/strings.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/native/windows/file.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/native/windows/file.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/native/windows/file.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/native/windows/file.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/native/windows/file.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/native/windows/file.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/native/windows/file.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/native/windows/file.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/native/windows/util.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/native/windows/util.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/native/windows/util.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/native/windows/util.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/native/windows/util.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/native/windows/util.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/main/native/windows/util.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/main/native/windows/util.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/tools/singlejar/diag.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/tools/singlejar/diag.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/tools/singlejar/diag.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/tools/singlejar/diag.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/tools/singlejar/options.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/tools/singlejar/options.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/tools/singlejar/options.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/tools/singlejar/options.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/tools/singlejar/port.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/tools/singlejar/port.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/src/tools/singlejar/port.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/src/tools/singlejar/port.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/zlib/crc32.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/zlib/crc32.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/zlib/crc32.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/zlib/crc32.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/zlib/zconf.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/zlib/zconf.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/zlib/zconf.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/zlib/zconf.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/zlib/zlib.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/zlib/zlib.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/250982d1f64669a05196274a519e1f62/external/remote_java_tools/java_tools/zlib/zlib.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/7a9dc81a628de03209c40f54ee683188/external/remote_java_tools/java_tools/zlib/zlib.h
diff --git a/src/out/amd64-generic/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared-internal.h b/src/out/amd64-generic/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared-internal.h
index 8331846..06dc69a 100644
--- a/src/out/amd64-generic/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared-internal.h
+++ b/src/out/amd64-generic/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared-internal.h
@@ -96,6 +96,7 @@
case 0:
case 1:
case 2:
+ case 3:
return true;
}
return false;
diff --git a/src/out/amd64-generic/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.cc b/src/out/amd64-generic/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.cc
index 02892d2..e1b4f2d 100644
--- a/src/out/amd64-generic/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.cc
+++ b/src/out/amd64-generic/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.cc
@@ -76,6 +76,8 @@
NOINLINE static const char* Executor_FileToStringHelper(Executor_File value) {
// Defined in a helper function to ensure that Clang generates a lookup table.
switch(value) {
+ case Executor_File::kCrashLog:
+ return "kCrashLog";
case Executor_File::kUEFISecureBootVariable:
return "kUEFISecureBootVariable";
case Executor_File::kUEFIPlatformSize:
diff --git a/src/out/amd64-generic/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.h b/src/out/amd64-generic/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.h
index 7b817f6..e5eadbd 100644
--- a/src/out/amd64-generic/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.h
+++ b/src/out/amd64-generic/gen/include/diagnostics/cros_healthd/mojom/executor.mojom-shared.h
@@ -157,13 +157,15 @@
enum class Executor_File : int32_t {
- kUEFISecureBootVariable = 0,
+ kCrashLog = 0,
- kUEFIPlatformSize = 1,
+ kUEFISecureBootVariable = 1,
- kWirelessPowerScheme = 2,
+ kUEFIPlatformSize = 2,
+
+ kWirelessPowerScheme = 3,
kMinValue = 0,
- kMaxValue = 2,
+ kMaxValue = 3,
};
std::ostream& operator<<(std::ostream& os, Executor_File value);
diff --git a/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared-internal.h b/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared-internal.h
index 33ef964..e89c74b 100644
--- a/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared-internal.h
+++ b/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared-internal.h
@@ -102,6 +102,7 @@
case 13:
case 14:
case 15:
+ case 16:
return true;
}
return false;
@@ -655,6 +656,8 @@
kStylusGarageEventInfo,
kStylusEventInfo,
+
+ kCrashEventInfo,
};
// A note on layout:
@@ -677,6 +680,7 @@
mojo::internal::Pointer<internal::TouchscreenEventInfo_Data> f_touchscreen_event_info;
mojo::internal::Pointer<internal::StylusGarageEventInfo_Data> f_stylus_garage_event_info;
mojo::internal::Pointer<internal::StylusEventInfo_Data> f_stylus_event_info;
+ mojo::internal::Pointer<internal::CrashEventInfo_Data> f_crash_event_info;
uint64_t unknown;
};
diff --git a/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.cc b/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.cc
index 0294094..84e1cb3 100644
--- a/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.cc
+++ b/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.cc
@@ -86,6 +86,8 @@
return "kStylusGarage";
case EventCategoryEnum::kStylus:
return "kStylus";
+ case EventCategoryEnum::kCrash:
+ return "kCrash";
default:
return nullptr;
}
@@ -787,6 +789,16 @@
return false;
return true;
}
+ case EventInfo_Tag::kCrashEventInfo: {
+
+ if (!mojo::internal::ValidatePointerNonNullable(
+ object->data.f_crash_event_info, 16, validation_context)) {
+ return false;
+ }
+ if (!mojo::internal::ValidateStruct(object->data.f_crash_event_info, validation_context))
+ return false;
+ return true;
+ }
default: {
return true;
diff --git a/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.h b/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.h
index 80881e5..4a7d93b 100644
--- a/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.h
+++ b/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom-shared.h
@@ -338,8 +338,10 @@
kStylusGarage = 14,
kStylus = 15,
+
+ kCrash = 16,
kMinValue = 0,
- kMaxValue = 15,
+ kMaxValue = 16,
kDefaultValue = 0
};
@@ -1856,6 +1858,17 @@
return mojo::internal::Deserialize<::ash::cros_healthd::mojom::StylusEventInfoDataView>(
data_->data.f_stylus_event_info.Get(), output, message_);
}
+ bool is_crash_event_info() const { return data_->tag == Tag::kCrashEventInfo; }
+ inline void GetCrashEventInfoDataView(
+ CrashEventInfoDataView* output) const;
+
+ template <typename UserType>
+ [[nodiscard]] bool ReadCrashEventInfo(UserType* output) const {
+
+ CHECK(is_crash_event_info());
+ return mojo::internal::Deserialize<::ash::cros_healthd::mojom::CrashEventInfoDataView>(
+ data_->data.f_crash_event_info.Get(), output, message_);
+ }
private:
internal::EventInfo_Data* data_ = nullptr;
@@ -3555,6 +3568,22 @@
value_fragment.is_null() ? nullptr : value_fragment.data());
break;
}
+ case ::ash::cros_healthd::mojom::EventInfoDataView::Tag::kCrashEventInfo: {
+ decltype(Traits::crash_event_info(input))
+ in_crash_event_info = Traits::crash_event_info(input);
+ mojo::internal::MessageFragment<
+ typename decltype(fragment->data.f_crash_event_info)::BaseType>
+ value_fragment(fragment.message());
+ mojo::internal::Serialize<::ash::cros_healthd::mojom::CrashEventInfoDataView>(
+ in_crash_event_info, value_fragment);
+ MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING(
+ value_fragment.is_null(),
+ mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER,
+ "null crash_event_info in EventInfo union");
+ fragment->data.f_crash_event_info.Set(
+ value_fragment.is_null() ? nullptr : value_fragment.data());
+ break;
+ }
}
}
@@ -3814,6 +3843,11 @@
CHECK(is_stylus_event_info());
*output = StylusEventInfoDataView(data_->data.f_stylus_event_info.Get(), message_);
}
+inline void EventInfoDataView::GetCrashEventInfoDataView(
+ CrashEventInfoDataView* output) const {
+ CHECK(is_crash_event_info());
+ *output = CrashEventInfoDataView(data_->data.f_crash_event_info.Get(), message_);
+}
} // namespace mojom
diff --git a/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.cc b/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.cc
index 4519d51..25bbcce 100644
--- a/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.cc
+++ b/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.cc
@@ -1404,6 +1404,17 @@
std::move(stylus_event_info));
}
}
+void EventInfo::set_crash_event_info(
+ CrashEventInfoPtr crash_event_info) {
+ if (tag_ == Tag::kCrashEventInfo) {
+ *(data_.crash_event_info) = std::move(crash_event_info);
+ } else {
+ DestroyActive();
+ tag_ = Tag::kCrashEventInfo;
+ data_.crash_event_info = new CrashEventInfoPtr(
+ std::move(crash_event_info));
+ }
+}
void EventInfo::DestroyActive() {
switch (tag_) {
@@ -1467,6 +1478,10 @@
delete data_.stylus_event_info;
break;
+ case Tag::kCrashEventInfo:
+
+ delete data_.crash_event_info;
+ break;
}
}
@@ -4488,6 +4503,15 @@
std::move(result_stylus_event_info));
break;
}
+ case Tag::kCrashEventInfo: {
+ ::ash::cros_healthd::mojom::CrashEventInfoPtr result_crash_event_info;
+ if (!input.ReadCrashEventInfo(&result_crash_event_info))
+ return false;
+
+ *output = UnionType::NewCrashEventInfo(
+ std::move(result_crash_event_info));
+ break;
+ }
default:
*output = UnionType::NewDefaultType({});
diff --git a/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.h b/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.h
index 3bdc877..6db7a96 100644
--- a/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.h
+++ b/src/out/amd64-generic/gen/include/diagnostics/mojom/public/cros_healthd_events.mojom.h
@@ -3224,6 +3224,14 @@
result->set_stylus_event_info(std::move(stylus_event_info));
return result;
}
+ // Construct an instance holding |crash_event_info|.
+ static EventInfoPtr
+ NewCrashEventInfo(
+ CrashEventInfoPtr crash_event_info) {
+ auto result = EventInfoPtr(absl::in_place);
+ result->set_crash_event_info(std::move(crash_event_info));
+ return result;
+ }
template <typename U>
static EventInfoPtr From(const U& u) {
@@ -3446,6 +3454,18 @@
void set_stylus_event_info(
StylusEventInfoPtr stylus_event_info);
+
+ bool is_crash_event_info() const { return tag_ == Tag::kCrashEventInfo; }
+
+
+ CrashEventInfoPtr& get_crash_event_info() const {
+ CHECK(tag_ == Tag::kCrashEventInfo);
+ return *(data_.crash_event_info);
+ }
+
+
+ void set_crash_event_info(
+ CrashEventInfoPtr crash_event_info);
template <typename UserType>
static mojo::Message SerializeAsMessage(UserType* input) {
@@ -3479,6 +3499,7 @@
TouchscreenEventInfoPtr* touchscreen_event_info;
StylusGarageEventInfoPtr* stylus_garage_event_info;
StylusEventInfoPtr* stylus_event_info;
+ CrashEventInfoPtr* crash_event_info;
};
static bool Validate(const void* data,
@@ -5145,6 +5166,9 @@
case Tag::kStylusEventInfo:
return NewStylusEventInfo(
mojo::Clone(*data_.stylus_event_info));
+ case Tag::kCrashEventInfo:
+ return NewCrashEventInfo(
+ mojo::Clone(*data_.crash_event_info));
}
return nullptr;
}
@@ -5187,6 +5211,8 @@
return mojo::Equals(*(data_.stylus_garage_event_info), *(other.data_.stylus_garage_event_info));
case Tag::kStylusEventInfo:
return mojo::Equals(*(data_.stylus_event_info), *(other.data_.stylus_event_info));
+ case Tag::kCrashEventInfo:
+ return mojo::Equals(*(data_.crash_event_info), *(other.data_.crash_event_info));
}
return false;
@@ -6453,6 +6479,10 @@
return input->get_stylus_event_info();
}
+ static const ::ash::cros_healthd::mojom::CrashEventInfoPtr& crash_event_info(const ::ash::cros_healthd::mojom::EventInfoPtr& input) {
+ return input->get_crash_event_info();
+ }
+
static bool Read(::ash::cros_healthd::mojom::EventInfo::DataView input, ::ash::cros_healthd::mojom::EventInfoPtr* output);
};
