Revert of Modify the paths of the resource files to point to chromium/src/tools/... (patchset #1 id:1 of https://codereview.webrtc.org/2528893002/ )
Reason for revert:
Didn't work
Original issue's description:
> Modify the paths of the resource files to point to chromium/src/tools/...
>
> R=kjellander@chromium.org
> BUG=chromium:497757
> NOTRY=True
>
> Committed: https://crrev.com/d8ae20b362f76d2153fa65b5d82d534c546c59a4
> Cr-Commit-Position: refs/heads/master@{#15225}
TBR=kjellander@chromium.org,kjellander@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:497757
Review-Url: https://codereview.webrtc.org/2532453002
Cr-Commit-Position: refs/heads/master@{#15226}
diff --git a/tools/valgrind-webrtc/python-google.gni b/tools/valgrind-webrtc/python-google.gni
index b2ec6c4..adc6a0f 100644
--- a/tools/valgrind-webrtc/python-google.gni
+++ b/tools/valgrind-webrtc/python-google.gni
@@ -7,21 +7,21 @@
# be found in the AUTHORS file in the root of the source tree.
python_google = [
- "../../chromium/src/tools/python/google/__init__.py",
- "../../chromium/src/tools/python/google/gethash_timer.py",
- "../../chromium/src/tools/python/google/httpd_config/httpd.conf",
- "../../chromium/src/tools/python/google/httpd_config/httpd2.conf",
- "../../chromium/src/tools/python/google/httpd_config/httpd2.pem",
- "../../chromium/src/tools/python/google/httpd_config/httpd2_linux.conf",
- "../../chromium/src/tools/python/google/httpd_config/httpd2_mac.conf",
- "../../chromium/src/tools/python/google/httpd_config/mime.types",
- "../../chromium/src/tools/python/google/httpd_config/root_ca_cert.pem",
- "../../chromium/src/tools/python/google/httpd_utils.py",
- "../../chromium/src/tools/python/google/logging_utils.py",
- "../../chromium/src/tools/python/google/path_utils.py",
- "../../chromium/src/tools/python/google/platform_utils.py",
- "../../chromium/src/tools/python/google/platform_utils_linux.py",
- "../../chromium/src/tools/python/google/platform_utils_mac.py",
- "../../chromium/src/tools/python/google/platform_utils_win.py",
- "../../chromium/src/tools/python/google/process_utils.py",
+ "../../tools/python/google/__init__.py",
+ "../../tools/python/google/gethash_timer.py",
+ "../../tools/python/google/httpd_config/httpd.conf",
+ "../../tools/python/google/httpd_config/httpd2.conf",
+ "../../tools/python/google/httpd_config/httpd2.pem",
+ "../../tools/python/google/httpd_config/httpd2_linux.conf",
+ "../../tools/python/google/httpd_config/httpd2_mac.conf",
+ "../../tools/python/google/httpd_config/mime.types",
+ "../../tools/python/google/httpd_config/root_ca_cert.pem",
+ "../../tools/python/google/httpd_utils.py",
+ "../../tools/python/google/logging_utils.py",
+ "../../tools/python/google/path_utils.py",
+ "../../tools/python/google/platform_utils.py",
+ "../../tools/python/google/platform_utils_linux.py",
+ "../../tools/python/google/platform_utils_mac.py",
+ "../../tools/python/google/platform_utils_win.py",
+ "../../tools/python/google/process_utils.py",
]
diff --git a/tools/valgrind-webrtc/valgrind.gni b/tools/valgrind-webrtc/valgrind.gni
index 1b6f1f7..52be8e4 100644
--- a/tools/valgrind-webrtc/valgrind.gni
+++ b/tools/valgrind-webrtc/valgrind.gni
@@ -6,29 +6,63 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
+import("//build_overrides/build.gni")
+
valgrind_dependencies = [
- "../../chromium/src/tools/valgrind/asan/asan_symbolize.py",
- "../../chromium/src/tools/valgrind/asan/third_party/__init__.py",
- "../../chromium/src/tools/valgrind/asan/third_party/asan_symbolize.py",
- "../../chromium/src/tools/valgrind/browser_wrapper_win.py",
- "../../chromium/src/tools/valgrind/chrome_tests.bat",
- "../../chromium/src/tools/valgrind/chrome_tests.py",
- "../../chromium/src/tools/valgrind/chrome_tests.sh",
- "../../chromium/src/tools/valgrind/common.py",
- "../../chromium/src/tools/valgrind/drmemory.bat",
- "../../chromium/src/tools/valgrind/drmemory_analyze.py",
- "../../chromium/src/tools/valgrind/fixed_suppressions.sh",
- "../../chromium/src/tools/valgrind/gdb_helper.py",
- "../../chromium/src/tools/valgrind/locate_valgrind.sh",
- "../../chromium/src/tools/valgrind/memcheck/suppressions.txt",
- "../../chromium/src/tools/valgrind/memcheck/suppressions_linux.txt",
- "../../chromium/src/tools/valgrind/memcheck_analyze.py",
- "../../chromium/src/tools/valgrind/regrind.sh",
- "../../chromium/src/tools/valgrind/scan-build.py",
- "../../chromium/src/tools/valgrind/suppressions.py",
- "../../chromium/src/tools/valgrind/test_suppressions.py",
- "../../chromium/src/tools/valgrind/unused_suppressions.py",
- "../../chromium/src/tools/valgrind/valgrind.sh",
- "../../chromium/src/tools/valgrind/valgrind_test.py",
- "../../chromium/src/tools/valgrind/waterfall.sh",
+ "../../tools/valgrind/asan/asan_symbolize.py",
+ "../../tools/valgrind/asan/third_party/__init__.py",
+ "../../tools/valgrind/asan/third_party/asan_symbolize.py",
+ "../../tools/valgrind/browser_wrapper_win.py",
+ "../../tools/valgrind/chrome_tests.bat",
+ "../../tools/valgrind/chrome_tests.py",
+ "../../tools/valgrind/chrome_tests.sh",
+ "../../tools/valgrind/common.py",
+ "../../tools/valgrind/drmemory.bat",
+ "../../tools/valgrind/drmemory_analyze.py",
+ "../../tools/valgrind/fixed_suppressions.sh",
+ "../../tools/valgrind/gdb_helper.py",
+ "../../tools/valgrind/locate_valgrind.sh",
+ "../../tools/valgrind/memcheck/suppressions.txt",
+ "../../tools/valgrind/memcheck/suppressions_linux.txt",
+ "../../tools/valgrind/memcheck_analyze.py",
+ "../../tools/valgrind/regrind.sh",
+ "../../tools/valgrind/scan-build.py",
+ "../../tools/valgrind/suppressions.py",
+ "../../tools/valgrind/test_suppressions.py",
+ "../../tools/valgrind/unused_suppressions.py",
+ "../../tools/valgrind/valgrind.sh",
+ "../../tools/valgrind/valgrind_test.py",
+ "../../tools/valgrind/waterfall.sh",
]
+
+if (build_with_chromium) {
+ valgrind_dependencies += [
+ "../../tools/valgrind/gtest_exclude/ash_unittests.gtest-memcheck.txt",
+ "../../tools/valgrind/gtest_exclude/aura_unittests.gtest.txt",
+ "../../tools/valgrind/gtest_exclude/base_unittests.gtest.txt",
+ "../../tools/valgrind/gtest_exclude/base_unittests.gtest_win-8.txt",
+ "../../tools/valgrind/gtest_exclude/base_unittests.gtest_win32.txt",
+ "../../tools/valgrind/gtest_exclude/blink_platform_unittests.gtest_win32.txt",
+ "../../tools/valgrind/gtest_exclude/browser_tests.gtest-memcheck.txt",
+ "../../tools/valgrind/gtest_exclude/chromeos_unittests.gtest.txt",
+ "../../tools/valgrind/gtest_exclude/components_unittests.gtest.txt",
+ "../../tools/valgrind/gtest_exclude/content_unittests.gtest.txt",
+ "../../tools/valgrind/gtest_exclude/extensions_unittests.gtest-memcheck.txt",
+ "../../tools/valgrind/gtest_exclude/interactive_ui_tests.gtest.txt",
+ "../../tools/valgrind/gtest_exclude/ipc_tests.gtest.txt",
+ "../../tools/valgrind/gtest_exclude/media_unittests.gtest.txt",
+ "../../tools/valgrind/gtest_exclude/message_center_unittests.gtest.txt",
+ "../../tools/valgrind/gtest_exclude/net_unittests.gtest-memcheck.txt",
+ "../../tools/valgrind/gtest_exclude/net_unittests.gtest.txt",
+ "../../tools/valgrind/gtest_exclude/net_unittests.gtest_linux.txt",
+ "../../tools/valgrind/gtest_exclude/remoting_unittests.gtest_win-8.txt",
+ "../../tools/valgrind/gtest_exclude/sandbox_linux_unittests.gtest.txt",
+ "../../tools/valgrind/gtest_exclude/suppressions.txt",
+ "../../tools/valgrind/gtest_exclude/sync_unit_tests.gtest-asan.txt",
+ "../../tools/valgrind/gtest_exclude/ui_base_unittests.gtest-memcheck.txt",
+ "../../tools/valgrind/gtest_exclude/ui_unittests.gtest-memcheck_linux.txt",
+ "../../tools/valgrind/gtest_exclude/unit_tests.gtest-memcheck.txt",
+ "../../tools/valgrind/gtest_exclude/unit_tests.gtest.txt",
+ "../../tools/valgrind/gtest_exclude/unit_tests.gtest_linux.txt",
+ ]
+}
