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

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

Issue 142173002: Add self tests for gyp_to_android. (Closed) Base URL: https://skia.googlesource.com/skia.git@GYP2
Patch Set: Rebase onto Patch Set 8 of https://codereview.chromium.org/140503007/ Created 6 years, 11 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 | platform_tools/android/bin/gyp_to_android.py » ('j') | 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 4088b506c886c351cd31ad4c340059df162167d4..9ce65aec3b74408c0b8211109cd6a6012c3eb2c4 100644
--- a/platform_tools/android/bin/android_framework_gyp.py
+++ b/platform_tools/android/bin/android_framework_gyp.py
@@ -12,29 +12,35 @@ Modified version of gyp_skia, used by gyp_to_android.py to generate Android.mk
import os
import sys
-script_dir = os.path.dirname(__file__)
+SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
# Unlike gyp_skia, this file is nested deep inside Skia. Find Skia's trunk dir.
# This line depends on the fact that the script is three levels deep
# (specifically, it is in platform_tools/android/bin).
-skia_dir = os.path.normpath(os.path.join(script_dir, os.pardir, os.pardir,
+SKIA_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, os.pardir, os.pardir,
os.pardir))
-dir_contents = os.listdir(skia_dir)
+dir_contents = os.listdir(SKIA_DIR)
assert 'third_party' in dir_contents and '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')
-
-# Directory within which we can find most of Skia's gyp configuration files.
-gyp_config_dir = os.path.join(skia_dir, 'gyp')
+GYP_SOURCE_DIR = os.path.join(SKIA_DIR, 'third_party', 'externals', 'gyp')
# Ensure we import our current gyp source's module, not any version
# pre-installed in your PYTHONPATH.
-sys.path.insert(0, os.path.join(gyp_source_dir, 'pylib'))
+sys.path.insert(0, os.path.join(GYP_SOURCE_DIR, 'pylib'))
import gyp
-def main(skia_arch_type, have_neon):
+def main(target_dir, target_file, skia_arch_type, have_neon):
+ """
+ Create gypd files based on target_file.
+ @param target_dir Directory containing all gyp files, including common.gypi
+ @param target_file Gyp file to start on. Other files within target_dir will
+ be read if target_file depends on them.
+ @param skia_arch_type Target architecture to pass to gyp.
+ @param have_neon Whether to generate files including neon optimizations.
+ Only meaningful if skia_arch_type is 'arm'.
+ """
# Set GYP_DEFINES for building for the android framework.
gyp_defines = ('skia_android_framework=1 OS=android skia_arch_type=%s '
% skia_arch_type)
@@ -50,10 +56,9 @@ def main(skia_arch_type, have_neon):
args = []
args.extend(['--depth', '.'])
- # Use the android_framework_lib file instead of skia.gyp
- args.extend([os.path.join(gyp_config_dir, 'android_framework_lib.gyp')])
+ args.extend([os.path.join(target_dir, target_file)])
# Common conditions
- args.extend(['-I', 'gyp/common.gypi'])
+ args.extend(['-I', os.path.join(target_dir, 'common.gypi')])
# Use the debugging format. We'll use these to create one master make file.
args.extend(['-f', 'gypd'])
« no previous file with comments | « no previous file | platform_tools/android/bin/gyp_to_android.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698