android: fix the build

References to mcontext_t's pstate were mistakenly changed to spsr here:
https://chromium-review.googlesource.com/c/crashpad/crashpad/+/1312193

Also Android's time_t is a signed type.

Change-Id: I4cf83d57b70dced9360a816e87c30a4aaba778ca
Reviewed-on: https://chromium-review.googlesource.com/c/1315789
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Joshua Peraza <jperaza@chromium.org>
This commit is contained in:
Joshua Peraza 2018-11-02 12:05:21 -07:00 committed by Commit Bot
parent 0b19010fba
commit da3c7e7ac5
2 changed files with 3 additions and 3 deletions

View File

@ -224,7 +224,7 @@ void InitializeContext(NativeCPUContext* context) {
}
context->uc_mcontext.sp = 1;
context->uc_mcontext.pc = 2;
context->uc_mcontext.spsr = 3;
context->uc_mcontext.pstate = 3;
auto test_context = reinterpret_cast<TestCoprocessorContext*>(
context->uc_mcontext.__reserved);
@ -254,7 +254,7 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
0);
EXPECT_EQ(actual.arm64->sp, expected.uc_mcontext.sp);
EXPECT_EQ(actual.arm64->pc, expected.uc_mcontext.pc);
EXPECT_EQ(actual.arm64->spsr, expected.uc_mcontext.spsr);
EXPECT_EQ(actual.arm64->spsr, expected.uc_mcontext.pstate);
auto test_context = reinterpret_cast<const TestCoprocessorContext*>(
expected.uc_mcontext.__reserved);

View File

@ -454,7 +454,7 @@ TEST(ProcessSnapshotMinidump, Modules) {
EXPECT_EQ(modules[i]->Name(), names[i]);
EXPECT_EQ(modules[i]->Address(), 0xbadf00dU);
EXPECT_EQ(modules[i]->Size(), 9001U);
EXPECT_EQ(modules[i]->Timestamp(), 1970U + i);
EXPECT_EQ(modules[i]->Timestamp(), static_cast<time_t>(1970U + i));
uint16_t v0;
uint16_t v1;