diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-29 00:39:45 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-29 00:39:45 +0000 |
| commit | a3987574c8fe9387ae8cb534d4f5248608b85b0e (patch) | |
| tree | c89004437d201efa451028e1ffecd3cdf4211ae0 /platform_tools | |
| parent | 16348bb421b9a2dcd2b4d379cfb92b5d46216088 (diff) | |
Explicitly include gyp_gen/android_framework_gyp.
Add __init__.py to gyp_gen and explicitly include android_framework_gyp
from there.
Fixes a bug where after moving that file, python was looking for it in
its old location, where there was a compiled version of the file.
BUG=skia:2468
R=epoger@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/251903003
git-svn-id: http://skia.googlecode.com/svn/trunk@14427 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/gyp_to_android.py | 18 | ||||
| -rw-r--r-- | platform_tools/android/gyp_gen/__init__.py | 0 | ||||
| -rw-r--r-- | platform_tools/android/tests/android_framework_gyp_tests.py | 7 |
3 files changed, 12 insertions, 13 deletions
diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py index f43d597a15..e885399644 100755 --- a/platform_tools/android/bin/gyp_to_android.py +++ b/platform_tools/android/bin/gyp_to_android.py @@ -21,15 +21,15 @@ SKIA_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, os.pardir, os.pardir, os.pardir)) # Find the directory with our helper files, and add it to the path. -GYP_GEN_DIR = os.path.join(SKIA_DIR, 'platform_tools', 'android', 'gyp_gen') -sys.path.append(GYP_GEN_DIR) - -import android_framework_gyp -import gypd_parser -import generate_user_config -import makefile_writer -import tool_makefile_writer -import vars_dict_lib +ANDROID_TOOLS = os.path.join(SKIA_DIR, 'platform_tools', 'android') +sys.path.append(ANDROID_TOOLS) + +import gyp_gen.android_framework_gyp as android_framework_gyp +import gyp_gen.gypd_parser as gypd_parser +import gyp_gen.generate_user_config as generate_user_config +import gyp_gen.makefile_writer as makefile_writer +import gyp_gen.tool_makefile_writer as tool_makefile_writer +import gyp_gen.vars_dict_lib as vars_dict_lib # Folder containing all gyp files and generated gypd files. GYP_FOLDER = 'gyp' diff --git a/platform_tools/android/gyp_gen/__init__.py b/platform_tools/android/gyp_gen/__init__.py new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/platform_tools/android/gyp_gen/__init__.py diff --git a/platform_tools/android/tests/android_framework_gyp_tests.py b/platform_tools/android/tests/android_framework_gyp_tests.py index 0b52c6b038..085123f4b9 100644 --- a/platform_tools/android/tests/android_framework_gyp_tests.py +++ b/platform_tools/android/tests/android_framework_gyp_tests.py @@ -16,10 +16,9 @@ import tempfile import test_variables import unittest -# Path to android_framework_gyp -sys.path.append(test_variables.GYP_GEN_DIR) +sys.path.append(test_variables.ANDROID_DIR) -import android_framework_gyp +import gyp_gen.android_framework_gyp GYPD_SUFFIX = ".gypd" GYP_SUFFIX = ".gyp" @@ -61,7 +60,7 @@ class CleanGypdTest(unittest.TestCase): def test_clean(self): """Test that clean_gypd_files() deletes .gypd files, and leaves others. """ - android_framework_gyp.clean_gypd_files(self.__tmp_dir) + gyp_gen.android_framework_gyp.clean_gypd_files(self.__tmp_dir) for i in range(self.__num_files): self.assert_file_exists('%s%s' % (str(i), GYPI_SUFFIX)) self.assert_file_exists('%s%s' % (str(i), GYP_SUFFIX)) |