Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1287)

Unified Diff: platform_tools/android/bin/android_framework_gyp.py

Issue 177073022: Use chromium's gyp if third_party is not available. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Update a comment. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/bin/android_framework_gyp.py
diff --git a/platform_tools/android/bin/android_framework_gyp.py b/platform_tools/android/bin/android_framework_gyp.py
index 7654492f0710f0ec1ff62c995a96cfc46d31f068..5d5befc0846594f58555e0791e4e7db3a0dd3e7a 100644
--- a/platform_tools/android/bin/android_framework_gyp.py
+++ b/platform_tools/android/bin/android_framework_gyp.py
@@ -19,11 +19,19 @@ SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
# (specifically, it is in platform_tools/android/bin).
SKIA_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, os.pardir, os.pardir,
os.pardir))
-dir_contents = os.listdir(SKIA_DIR)
-assert 'third_party' in dir_contents and 'gyp' in dir_contents
+DIR_CONTENTS = os.listdir(SKIA_DIR)
+assert 'gyp' in DIR_CONTENTS
# Directory within which we can find the gyp source.
-GYP_SOURCE_DIR = os.path.join(SKIA_DIR, 'third_party', 'externals', 'gyp')
+if 'third_party' in DIR_CONTENTS:
+ GYP_SOURCE_DIR = os.path.join(SKIA_DIR, 'third_party', 'externals', 'gyp')
+else:
+ # In an Android tree, there is no third_party/externals/gyp, which would
+ # require running gclient sync. Use chromium's instead.
+ GYP_SOURCE_DIR = os.path.join(SKIA_DIR, os.pardir, 'chromium_org', 'tools',
+ 'gyp')
+
+assert os.path.exists(GYP_SOURCE_DIR)
# Ensure we import our current gyp source's module, not any version
# pre-installed in your PYTHONPATH.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698