Remove use of -isystem for googletest
Use standard include_dirs and a proxy header to manually suppress
warning. This solves the problem of sign conversion warning that
fire only when rolling into chrome.
Follow-up CLs will try to remove -isystem also to other
buildtools. Limiting the scope of this for now.
Change-Id: I8bc7924a95c7dd73cad54f447c122bd339e4e2a4
Bug: 129130827
diff --git a/test/cts/device_feature_test_cts.cc b/test/cts/device_feature_test_cts.cc
index eb57888..c91fe49 100644
--- a/test/cts/device_feature_test_cts.cc
+++ b/test/cts/device_feature_test_cts.cc
@@ -16,7 +16,7 @@
#include <sys/sysinfo.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
diff --git a/test/cts/end_to_end_integrationtest_cts.cc b/test/cts/end_to_end_integrationtest_cts.cc
index a83c816..f1130ff 100644
--- a/test/cts/end_to_end_integrationtest_cts.cc
+++ b/test/cts/end_to_end_integrationtest_cts.cc
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include <gtest/gtest.h>
#include <sys/system_properties.h>
#include <random>
+#include "test/gtest_and_gmock.h"
#include "perfetto/ext/traced/traced.h"
#include "perfetto/ext/tracing/core/trace_packet.h"
diff --git a/test/cts/heapprofd_test_cts.cc b/test/cts/heapprofd_test_cts.cc
index f27d422..4a9f0a9 100644
--- a/test/cts/heapprofd_test_cts.cc
+++ b/test/cts/heapprofd_test_cts.cc
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-#include <gtest/gtest.h>
#include <stdlib.h>
#include <sys/system_properties.h>
#include <sys/types.h>
@@ -24,6 +23,7 @@
#include "perfetto/base/logging.h"
#include "perfetto/tracing/core/data_source_config.h"
#include "src/base/test/test_task_runner.h"
+#include "test/gtest_and_gmock.h"
#include "test/test_helper.h"
#include "perfetto/config/profiling/heapprofd_config.pb.h"
