From 53914165e4a19e4a320cf3394e4fabff4e89d7c6 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Thu, 8 Feb 2018 19:27:47 -0800 Subject: [PATCH] Expose per arch headers. Bug: 73013352 Test: Compiles. Change-Id: Ic05660db7d7858a9857143ee5e58cdaddcf52a35 --- libunwindstack/ArmExidx.cpp | 2 +- libunwindstack/DwarfEhFrame.h | 2 +- libunwindstack/ElfInterfaceArm.cpp | 2 +- libunwindstack/Regs.cpp | 17 ++++++++--------- libunwindstack/RegsArm.cpp | 7 +++---- libunwindstack/RegsArm64.cpp | 7 +++---- libunwindstack/RegsMips.cpp | 7 +++---- libunwindstack/RegsMips64.cpp | 7 +++---- libunwindstack/RegsX86.cpp | 7 +++---- libunwindstack/RegsX86_64.cpp | 7 +++---- .../{ => include/unwindstack}/MachineArm.h | 0 .../{ => include/unwindstack}/MachineArm64.h | 0 .../{ => include/unwindstack}/MachineMips.h | 0 .../{ => include/unwindstack}/MachineMips64.h | 0 .../{ => include/unwindstack}/MachineX86.h | 0 .../{ => include/unwindstack}/MachineX86_64.h | 0 .../{ => include/unwindstack}/UcontextArm.h | 2 +- .../{ => include/unwindstack}/UcontextArm64.h | 2 +- .../{ => include/unwindstack}/UcontextMips.h | 2 +- .../{ => include/unwindstack}/UcontextMips64.h | 4 ++-- .../{ => include/unwindstack}/UcontextX86.h | 2 +- .../{ => include/unwindstack}/UcontextX86_64.h | 2 +- .../{ => include/unwindstack}/UserArm.h | 0 .../{ => include/unwindstack}/UserArm64.h | 0 .../{ => include/unwindstack}/UserMips.h | 0 .../{ => include/unwindstack}/UserMips64.h | 0 .../{ => include/unwindstack}/UserX86.h | 0 .../{ => include/unwindstack}/UserX86_64.h | 0 libunwindstack/tests/ElfInterfaceArmTest.cpp | 2 +- libunwindstack/tests/RegsIterateTest.cpp | 17 ++++++++--------- .../tests/RegsStepIfSignalHandlerTest.cpp | 17 ++++++++--------- libunwindstack/tests/UnwindOfflineTest.cpp | 7 +++---- 32 files changed, 56 insertions(+), 66 deletions(-) rename libunwindstack/{ => include/unwindstack}/MachineArm.h (100%) rename libunwindstack/{ => include/unwindstack}/MachineArm64.h (100%) rename libunwindstack/{ => include/unwindstack}/MachineMips.h (100%) rename libunwindstack/{ => include/unwindstack}/MachineMips64.h (100%) rename libunwindstack/{ => include/unwindstack}/MachineX86.h (100%) rename libunwindstack/{ => include/unwindstack}/MachineX86_64.h (100%) rename libunwindstack/{ => include/unwindstack}/UcontextArm.h (98%) rename libunwindstack/{ => include/unwindstack}/UcontextArm64.h (98%) rename libunwindstack/{ => include/unwindstack}/UcontextMips.h (98%) rename libunwindstack/{ => include/unwindstack}/UcontextMips64.h (96%) rename libunwindstack/{ => include/unwindstack}/UcontextX86.h (98%) rename libunwindstack/{ => include/unwindstack}/UcontextX86_64.h (98%) rename libunwindstack/{ => include/unwindstack}/UserArm.h (100%) rename libunwindstack/{ => include/unwindstack}/UserArm64.h (100%) rename libunwindstack/{ => include/unwindstack}/UserMips.h (100%) rename libunwindstack/{ => include/unwindstack}/UserMips64.h (100%) rename libunwindstack/{ => include/unwindstack}/UserX86.h (100%) rename libunwindstack/{ => include/unwindstack}/UserX86_64.h (100%) diff --git a/libunwindstack/ArmExidx.cpp b/libunwindstack/ArmExidx.cpp index 65638aea3..6e397e31f 100644 --- a/libunwindstack/ArmExidx.cpp +++ b/libunwindstack/ArmExidx.cpp @@ -22,12 +22,12 @@ #include #include +#include #include #include #include "ArmExidx.h" #include "Check.h" -#include "MachineArm.h" namespace unwindstack { diff --git a/libunwindstack/DwarfEhFrame.h b/libunwindstack/DwarfEhFrame.h index 2589c89f2..7a41e4550 100644 --- a/libunwindstack/DwarfEhFrame.h +++ b/libunwindstack/DwarfEhFrame.h @@ -46,4 +46,4 @@ class DwarfEhFrame : public DwarfSectionImpl { } // namespace unwindstack -#endif // _LIBUNWINDSTACK_DWARF_EH_FRAME_WITH_HDR_H +#endif // _LIBUNWINDSTACK_DWARF_EH_FRAME_H diff --git a/libunwindstack/ElfInterfaceArm.cpp b/libunwindstack/ElfInterfaceArm.cpp index 616d1b1a1..dfb8e8f91 100644 --- a/libunwindstack/ElfInterfaceArm.cpp +++ b/libunwindstack/ElfInterfaceArm.cpp @@ -17,12 +17,12 @@ #include #include +#include #include #include #include "ArmExidx.h" #include "ElfInterfaceArm.h" -#include "MachineArm.h" namespace unwindstack { diff --git a/libunwindstack/Regs.cpp b/libunwindstack/Regs.cpp index 7feafadf2..c7dec5259 100644 --- a/libunwindstack/Regs.cpp +++ b/libunwindstack/Regs.cpp @@ -25,17 +25,16 @@ #include #include #include -#include -#include #include #include - -#include "UserArm.h" -#include "UserArm64.h" -#include "UserX86.h" -#include "UserX86_64.h" -#include "UserMips.h" -#include "UserMips64.h" +#include +#include +#include +#include +#include +#include +#include +#include namespace unwindstack { diff --git a/libunwindstack/RegsArm.cpp b/libunwindstack/RegsArm.cpp index d05c3e29d..7f1614690 100644 --- a/libunwindstack/RegsArm.cpp +++ b/libunwindstack/RegsArm.cpp @@ -19,13 +19,12 @@ #include #include +#include #include #include #include - -#include "MachineArm.h" -#include "UcontextArm.h" -#include "UserArm.h" +#include +#include namespace unwindstack { diff --git a/libunwindstack/RegsArm64.cpp b/libunwindstack/RegsArm64.cpp index 2077bc5ff..d6b467ade 100644 --- a/libunwindstack/RegsArm64.cpp +++ b/libunwindstack/RegsArm64.cpp @@ -19,13 +19,12 @@ #include #include +#include #include #include #include - -#include "MachineArm64.h" -#include "UcontextArm64.h" -#include "UserArm64.h" +#include +#include namespace unwindstack { diff --git a/libunwindstack/RegsMips.cpp b/libunwindstack/RegsMips.cpp index 44cde052f..6751f52dd 100644 --- a/libunwindstack/RegsMips.cpp +++ b/libunwindstack/RegsMips.cpp @@ -19,13 +19,12 @@ #include #include +#include #include #include #include - -#include "MachineMips.h" -#include "UcontextMips.h" -#include "UserMips.h" +#include +#include namespace unwindstack { diff --git a/libunwindstack/RegsMips64.cpp b/libunwindstack/RegsMips64.cpp index b4e524603..97082bd9d 100644 --- a/libunwindstack/RegsMips64.cpp +++ b/libunwindstack/RegsMips64.cpp @@ -19,13 +19,12 @@ #include #include +#include #include #include #include - -#include "MachineMips64.h" -#include "UcontextMips64.h" -#include "UserMips64.h" +#include +#include namespace unwindstack { diff --git a/libunwindstack/RegsX86.cpp b/libunwindstack/RegsX86.cpp index ef2f3decc..27476b7cb 100644 --- a/libunwindstack/RegsX86.cpp +++ b/libunwindstack/RegsX86.cpp @@ -19,13 +19,12 @@ #include #include +#include #include #include #include - -#include "MachineX86.h" -#include "UcontextX86.h" -#include "UserX86.h" +#include +#include namespace unwindstack { diff --git a/libunwindstack/RegsX86_64.cpp b/libunwindstack/RegsX86_64.cpp index 70921f8b2..0f66943aa 100644 --- a/libunwindstack/RegsX86_64.cpp +++ b/libunwindstack/RegsX86_64.cpp @@ -19,13 +19,12 @@ #include #include +#include #include #include #include - -#include "MachineX86_64.h" -#include "UcontextX86_64.h" -#include "UserX86_64.h" +#include +#include namespace unwindstack { diff --git a/libunwindstack/MachineArm.h b/libunwindstack/include/unwindstack/MachineArm.h similarity index 100% rename from libunwindstack/MachineArm.h rename to libunwindstack/include/unwindstack/MachineArm.h diff --git a/libunwindstack/MachineArm64.h b/libunwindstack/include/unwindstack/MachineArm64.h similarity index 100% rename from libunwindstack/MachineArm64.h rename to libunwindstack/include/unwindstack/MachineArm64.h diff --git a/libunwindstack/MachineMips.h b/libunwindstack/include/unwindstack/MachineMips.h similarity index 100% rename from libunwindstack/MachineMips.h rename to libunwindstack/include/unwindstack/MachineMips.h diff --git a/libunwindstack/MachineMips64.h b/libunwindstack/include/unwindstack/MachineMips64.h similarity index 100% rename from libunwindstack/MachineMips64.h rename to libunwindstack/include/unwindstack/MachineMips64.h diff --git a/libunwindstack/MachineX86.h b/libunwindstack/include/unwindstack/MachineX86.h similarity index 100% rename from libunwindstack/MachineX86.h rename to libunwindstack/include/unwindstack/MachineX86.h diff --git a/libunwindstack/MachineX86_64.h b/libunwindstack/include/unwindstack/MachineX86_64.h similarity index 100% rename from libunwindstack/MachineX86_64.h rename to libunwindstack/include/unwindstack/MachineX86_64.h diff --git a/libunwindstack/UcontextArm.h b/libunwindstack/include/unwindstack/UcontextArm.h similarity index 98% rename from libunwindstack/UcontextArm.h rename to libunwindstack/include/unwindstack/UcontextArm.h index 8c94166af..7d1ec3b9a 100644 --- a/libunwindstack/UcontextArm.h +++ b/libunwindstack/include/unwindstack/UcontextArm.h @@ -31,7 +31,7 @@ #include -#include "MachineArm.h" +#include namespace unwindstack { diff --git a/libunwindstack/UcontextArm64.h b/libunwindstack/include/unwindstack/UcontextArm64.h similarity index 98% rename from libunwindstack/UcontextArm64.h rename to libunwindstack/include/unwindstack/UcontextArm64.h index 655719f83..a68be3b64 100644 --- a/libunwindstack/UcontextArm64.h +++ b/libunwindstack/include/unwindstack/UcontextArm64.h @@ -31,7 +31,7 @@ #include -#include "MachineArm64.h" +#include namespace unwindstack { diff --git a/libunwindstack/UcontextMips.h b/libunwindstack/include/unwindstack/UcontextMips.h similarity index 98% rename from libunwindstack/UcontextMips.h rename to libunwindstack/include/unwindstack/UcontextMips.h index 27185e713..02e33b64e 100644 --- a/libunwindstack/UcontextMips.h +++ b/libunwindstack/include/unwindstack/UcontextMips.h @@ -31,7 +31,7 @@ #include -#include "MachineMips.h" +#include namespace unwindstack { diff --git a/libunwindstack/UcontextMips64.h b/libunwindstack/include/unwindstack/UcontextMips64.h similarity index 96% rename from libunwindstack/UcontextMips64.h rename to libunwindstack/include/unwindstack/UcontextMips64.h index 623bf3a0b..5b92a55ae 100644 --- a/libunwindstack/UcontextMips64.h +++ b/libunwindstack/include/unwindstack/UcontextMips64.h @@ -31,7 +31,7 @@ #include -#include "MachineMips64.h" +#include namespace unwindstack { @@ -66,4 +66,4 @@ struct mips64_ucontext_t { } // namespace unwindstack -#endif // _LIBUNWINDSTACK_UCONTEXT_MIPS6464_H +#endif // _LIBUNWINDSTACK_UCONTEXT_MIPS64_H diff --git a/libunwindstack/UcontextX86.h b/libunwindstack/include/unwindstack/UcontextX86.h similarity index 98% rename from libunwindstack/UcontextX86.h rename to libunwindstack/include/unwindstack/UcontextX86.h index f79d92b3a..c96ebb70b 100644 --- a/libunwindstack/UcontextX86.h +++ b/libunwindstack/include/unwindstack/UcontextX86.h @@ -31,7 +31,7 @@ #include -#include "MachineX86.h" +#include namespace unwindstack { diff --git a/libunwindstack/UcontextX86_64.h b/libunwindstack/include/unwindstack/UcontextX86_64.h similarity index 98% rename from libunwindstack/UcontextX86_64.h rename to libunwindstack/include/unwindstack/UcontextX86_64.h index 2b8bdc4f0..4e163e5d4 100644 --- a/libunwindstack/UcontextX86_64.h +++ b/libunwindstack/include/unwindstack/UcontextX86_64.h @@ -31,7 +31,7 @@ #include -#include "MachineX86_64.h" +#include namespace unwindstack { diff --git a/libunwindstack/UserArm.h b/libunwindstack/include/unwindstack/UserArm.h similarity index 100% rename from libunwindstack/UserArm.h rename to libunwindstack/include/unwindstack/UserArm.h diff --git a/libunwindstack/UserArm64.h b/libunwindstack/include/unwindstack/UserArm64.h similarity index 100% rename from libunwindstack/UserArm64.h rename to libunwindstack/include/unwindstack/UserArm64.h diff --git a/libunwindstack/UserMips.h b/libunwindstack/include/unwindstack/UserMips.h similarity index 100% rename from libunwindstack/UserMips.h rename to libunwindstack/include/unwindstack/UserMips.h diff --git a/libunwindstack/UserMips64.h b/libunwindstack/include/unwindstack/UserMips64.h similarity index 100% rename from libunwindstack/UserMips64.h rename to libunwindstack/include/unwindstack/UserMips64.h diff --git a/libunwindstack/UserX86.h b/libunwindstack/include/unwindstack/UserX86.h similarity index 100% rename from libunwindstack/UserX86.h rename to libunwindstack/include/unwindstack/UserX86.h diff --git a/libunwindstack/UserX86_64.h b/libunwindstack/include/unwindstack/UserX86_64.h similarity index 100% rename from libunwindstack/UserX86_64.h rename to libunwindstack/include/unwindstack/UserX86_64.h diff --git a/libunwindstack/tests/ElfInterfaceArmTest.cpp b/libunwindstack/tests/ElfInterfaceArmTest.cpp index 31d6a6314..70a52ad1e 100644 --- a/libunwindstack/tests/ElfInterfaceArmTest.cpp +++ b/libunwindstack/tests/ElfInterfaceArmTest.cpp @@ -20,10 +20,10 @@ #include +#include #include #include "ElfInterfaceArm.h" -#include "MachineArm.h" #include "ElfFake.h" #include "MemoryFake.h" diff --git a/libunwindstack/tests/RegsIterateTest.cpp b/libunwindstack/tests/RegsIterateTest.cpp index 8b5b31ff9..9a27dbd21 100644 --- a/libunwindstack/tests/RegsIterateTest.cpp +++ b/libunwindstack/tests/RegsIterateTest.cpp @@ -24,20 +24,19 @@ #include #include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include #include #include - -#include "MachineArm.h" -#include "MachineArm64.h" -#include "MachineX86.h" -#include "MachineX86_64.h" -#include "MachineMips.h" -#include "MachineMips64.h" +#include +#include namespace unwindstack { diff --git a/libunwindstack/tests/RegsStepIfSignalHandlerTest.cpp b/libunwindstack/tests/RegsStepIfSignalHandlerTest.cpp index ef9e61cfa..ecd40518b 100644 --- a/libunwindstack/tests/RegsStepIfSignalHandlerTest.cpp +++ b/libunwindstack/tests/RegsStepIfSignalHandlerTest.cpp @@ -19,19 +19,18 @@ #include #include +#include +#include +#include +#include +#include +#include #include #include -#include -#include #include #include - -#include "MachineArm.h" -#include "MachineArm64.h" -#include "MachineX86.h" -#include "MachineX86_64.h" -#include "MachineMips.h" -#include "MachineMips64.h" +#include +#include #include "MemoryFake.h" diff --git a/libunwindstack/tests/UnwindOfflineTest.cpp b/libunwindstack/tests/UnwindOfflineTest.cpp index e93d8265a..e49959369 100644 --- a/libunwindstack/tests/UnwindOfflineTest.cpp +++ b/libunwindstack/tests/UnwindOfflineTest.cpp @@ -26,6 +26,9 @@ #include #include +#include +#include +#include #include #include #include @@ -33,10 +36,6 @@ #include #include -#include "MachineArm.h" -#include "MachineArm64.h" -#include "MachineX86.h" - #include "ElfTestUtils.h" namespace unwindstack {