Android: Fix orderfile out dir
Previously out/Release/Release would be used. Switch to _OUT_DIR
instead.
Bug: 327229370
Change-Id: I5d156a02241162685bbbbb1b05ebf56a12978396
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5335504
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: Egor Pasko <pasko@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1267161}
diff --git a/tools/cygprofile/orderfile_generator_backend.py b/tools/cygprofile/orderfile_generator_backend.py
index 531a995a..75f8fda5 100755
--- a/tools/cygprofile/orderfile_generator_backend.py
+++ b/tools/cygprofile/orderfile_generator_backend.py
@@ -522,8 +522,10 @@
"""
_CHECK_ORDERFILE_SCRIPT = os.path.join(
constants.DIR_SOURCE_ROOT, 'tools', 'cygprofile', 'check_orderfile.py')
- _BUILD_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(
- constants.GetOutDirectory()))) # Normally /path/to/src
+ # Normally /path/to/src/out.
+ _OUT_DIR = os.path.abspath(os.path.dirname(constants.GetOutDirectory()))
+ # Normally /path/to/src.
+ _BUILD_ROOT = os.path.dirname(_OUT_DIR)
# Previous orderfile_generator debug files would be overwritten.
_DIRECTORY_FOR_DEBUG_FILES = '/tmp/orderfile_generator_debug_files'
@@ -609,7 +611,7 @@
if os.path.exists(self._instrumented_out_dir):
# Clean up any old leftover instrumented dirs.
shutil.rmtree(self._instrumented_out_dir, ignore_errors=True)
- self._instrumented_out_dir = constants.GetOutDirectory()
+ self._instrumented_out_dir = self._OUT_DIR
self._uninstrumented_out_dir = os.path.join(
self._BUILD_ROOT, self._options.arch + '_uninstrumented_out')