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

Issue 242203008: Allow running gyp_to_android without SkUserConfig. (Closed)

Created:
6 years, 8 months ago by scroggo
Modified:
6 years, 8 months ago
CC:
skia-review_googlegroups.com
Base URL:
https://skia.googlesource.com/skia.git@master
Visibility:
Public.

Description

Allow running gyp_to_android without SkUserConfig. The old code requires that include/config/SkUserConfig.h exists, to ensure that it gets copied into Android's include/core/SkUserConfig.h when we do a merge. However, if a developer wants to make changes and rerun the script, they should not have to recreate include/config/SkUserConfig.h just to rerun the script. By default, allow the original to not exist and just skip the copy. Update tests to pass. Also add tests to support this use case. Make gyp_to_android.py executable. Committed: http://code.google.com/p/skia/source/detail?r=14273

Patch Set 1 #

Total comments: 2

Patch Set 2 : copyfileobj, tests, gyp_to_android executable. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+42 lines, -23 lines) Patch
M platform_tools/android/bin/gyp_to_android.py View 1 2 chunks +5 lines, -2 lines 0 comments Download
M platform_tools/android/gyp_gen/generate_user_config.py View 1 5 chunks +12 lines, -5 lines 0 comments Download
A + platform_tools/android/tests/expectations/missing-filename.xxx View 1 1 chunk +0 lines, -10 lines 0 comments Download
M platform_tools/android/tests/generate_user_config_tests.py View 1 4 chunks +25 lines, -6 lines 0 comments Download

Messages

Total messages: 6 (0 generated)
scroggo
6 years, 8 months ago (2014-04-18 19:51:27 UTC) #1
hal.canary
lgtm https://codereview.chromium.org/242203008/diff/1/platform_tools/android/gyp_gen/generate_user_config.py File platform_tools/android/gyp_gen/generate_user_config.py (right): https://codereview.chromium.org/242203008/diff/1/platform_tools/android/gyp_gen/generate_user_config.py#newcode72 platform_tools/android/gyp_gen/generate_user_config.py:72: with open(original_sk_user_config, 'r') as original: Possibly faster (as ...
6 years, 8 months ago (2014-04-18 20:10:04 UTC) #2
scroggo
Patch set two updates the tests, and makes gyp_to_android.py executable. https://codereview.chromium.org/242203008/diff/1/platform_tools/android/gyp_gen/generate_user_config.py File platform_tools/android/gyp_gen/generate_user_config.py (right): https://codereview.chromium.org/242203008/diff/1/platform_tools/android/gyp_gen/generate_user_config.py#newcode72 ...
6 years, 8 months ago (2014-04-18 22:24:16 UTC) #3
scroggo
The CQ bit was checked by scroggo@google.com
6 years, 8 months ago (2014-04-21 13:49:07 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://skia-tree-status.appspot.com/cq/scroggo@google.com/242203008/20001
6 years, 8 months ago (2014-04-21 13:49:11 UTC) #5
commit-bot: I haz the power
6 years, 8 months ago (2014-04-21 14:45:05 UTC) #6
Message was sent while issue was closed.
Change committed as 14273

Powered by Google App Engine
This is Rietveld 408576698