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

Unified Diff: build/android/setup.gyp

Issue 1885503002: Revert of [Devil] Replace generated Devil config with jinja template. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « build/android/gyp_devil_jinja_processor.py ('k') | build/android/test_runner.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/setup.gyp
diff --git a/build/android/setup.gyp b/build/android/setup.gyp
index 2e6f0d49addb55b09a311d330e7895b81c0d2113..0ef0531556183f6723ac208b4b049a25e45189f0 100644
--- a/build/android/setup.gyp
+++ b/build/android/setup.gyp
@@ -47,39 +47,6 @@
}
],
},
- {
- # We cannot use the jinja gypi file because we need to do operations with
- # the PRODUCT_DIR variable before passing it to the jinja template.
- # This variable is not known at GYP time so we have to pass it to a
- # wrapper script to do the operations.
- 'target_name': 'devil_chromium_config',
- 'type': 'none',
- 'actions': [
- {
- 'action_name': 'devil_chromium_config__jinja_template',
- 'message': 'processing jinja template',
- 'variables': {
- 'output_file_name': 'devil_chromium.json',
- },
- 'action': [
- 'python', '<(DEPTH)/build/android/gyp_devil_jinja_processor.py',
- '--android-abi', '<(android_app_abi)',
- '--android-sdk-root', '<(android_sdk_root)',
- '--build-tools-version', '<(android_sdk_build_tools_version)',
- '--input-file-path', '<(DEPTH)/build/android/devil_chromium.jinja',
- '--output-file-name', '<(output_file_name)',
- '--product-dir', '<(PRODUCT_DIR)',
- ],
- 'inputs': [
- '<(DEPTH)/build/android/gyp_devil_jinja_processor.py',
- '<(DEPTH)/build/android/gyp/jinja_template.py',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/gen/<(output_file_name)',
- ]
- },
- ],
- }, # devil_chromium_config
{
# Target for creating common output build directories. Creating output
# dirs beforehand ensures that build scripts can assume these folders to
« no previous file with comments | « build/android/gyp_devil_jinja_processor.py ('k') | build/android/test_runner.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698