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