1From 702acfbe733e5b047759a3bfee71c8b63e5814fe Mon Sep 17 00:00:00 2001
2From: Hidehiko Abe <hidehiko@chromium.org>
3Date: Thu, 13 Jun 2019 23:02:42 +0900
4Subject: [PATCH] libchrome: Unpatch sys.path update.
5
6Unlike soong build, original sys.path change works.
7
8BUG=chromium:909719
9TEST=Built locally.
10
11Change-Id: I6c8ac8d4a1d156ddd77ec75485d42a810a9e61fe
12---
13 build/android/gyp/util/build_utils.py | 12 ++----------
14 1 file changed, 2 insertions(+), 10 deletions(-)
15
16diff --git a/build/android/gyp/util/build_utils.py b/build/android/gyp/util/build_utils.py
17index 426de03..f1764b9 100644
18--- a/build/android/gyp/util/build_utils.py
19+++ b/build/android/gyp/util/build_utils.py
20@@ -25,16 +25,8 @@ import zipfile
21 # Some clients do not add //build/android/gyp to PYTHONPATH.
22 import md5_check  # pylint: disable=relative-import
23
24-# pylib conflicts with mojo/public/tools/bindings/pylib. Prioritize
25-# build/android/pylib.
26-# PYTHONPATH wouldn't help in this case, because soong put source files under
27-# temp directory for each build, so the abspath is unknown until the
28-# execution.
29-#sys.path.append(os.path.join(os.path.dirname(__file__),
30-#                             os.pardir, os.pardir, os.pardir))
31-sys.path.insert(0, os.path.join(os.path.dirname(__file__),
32-                                os.pardir, os.pardir))
33-
34+sys.path.append(os.path.join(os.path.dirname(__file__),
35+                             os.pardir, os.pardir, os.pardir))
36 import gn_helpers
37
38 # Definition copied from pylib/constants/__init__.py to avoid adding
39--
402.22.0.rc2.383.gf4fbbf30c2-goog
41
42