Change includes to support new slicer header location
This should prevent any future issues with header or macro name
collisions.
Also remove the pragmas for undefining the CHECK macro since we
renamed the incompatible slicer version.
Warning pragmas are still required.
Bug: 65422458
Test: ./test.py --host --redefine-stress
Change-Id: I076302743163e08a9b16f44fb894f5d96b38712e
diff --git a/test/983-source-transform-verify/source_transform_slicer.cc b/test/983-source-transform-verify/source_transform_slicer.cc
index abf32e7..34de625 100644
--- a/test/983-source-transform-verify/source_transform_slicer.cc
+++ b/test/983-source-transform-verify/source_transform_slicer.cc
@@ -17,15 +17,10 @@
#include "source_transform.h"
#pragma clang diagnostic push
-// slicer defines its own CHECK. b/65422458
-#pragma push_macro("CHECK")
-#undef CHECK
-
// Slicer's headers have code that triggers these warnings. b/65298177
#pragma clang diagnostic ignored "-Wsign-compare"
-#include "reader.h"
+#include "slicer/reader.h"
-#pragma pop_macro("CHECK")
#pragma clang diagnostic pop
namespace art {
diff --git a/test/ti-stress/stress.cc b/test/ti-stress/stress.cc
index 7fc289f..d2da244 100644
--- a/test/ti-stress/stress.cc
+++ b/test/ti-stress/stress.cc
@@ -29,22 +29,19 @@
#include "utils.h"
#pragma clang diagnostic push
-// slicer defines its own CHECK. b/65422458
-#pragma push_macro("CHECK")
-#undef CHECK
// Slicer's headers have code that triggers these warnings. b/65298177
#pragma clang diagnostic ignored "-Wunused-parameter"
#pragma clang diagnostic ignored "-Wsign-compare"
-#include "code_ir.h"
-#include "control_flow_graph.h"
-#include "dex_ir.h"
-#include "dex_ir_builder.h"
-#include "instrumentation.h"
-#include "reader.h"
-#include "writer.h"
-#pragma pop_macro("CHECK")
+#include "slicer/code_ir.h"
+#include "slicer/control_flow_graph.h"
+#include "slicer/dex_ir.h"
+#include "slicer/dex_ir_builder.h"
+#include "slicer/instrumentation.h"
+#include "slicer/reader.h"
+#include "slicer/writer.h"
+
#pragma clang diagnostic pop
namespace art {