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

Unified Diff: gyp/microhttpd.gyp

Issue 1775203002: Add SkDrawPosTextHCommand JSON, fix skiaserve build. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix position count, always define target. Created 4 years, 9 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 | « gyp/json.gyp ('k') | gyp/most.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/microhttpd.gyp
diff --git a/gyp/microhttpd.gyp b/gyp/microhttpd.gyp
index 58ea0baa74acbda99b9fa72111f4ac65d687b6b4..5254c022507279ffd3fa438dd78cde15d516a2d2 100644
--- a/gyp/microhttpd.gyp
+++ b/gyp/microhttpd.gyp
@@ -8,17 +8,17 @@
'targets': [
{
'target_name': 'microhttpd',
- 'type': 'static_library',
+ 'type': 'none',
'variables': {
'base_dir%': '../third_party/libmicrohttpd',
+ 'out_dir%': '<(INTERMEDIATE_DIR)/build',
'src_dir%': '../third_party/externals/microhttpd',
},
'direct_dependent_settings': {
'include_dirs': [
'<(src_dir)/src/include',
],
- # for reasons I can't quite fathom, we need the below line to trigger
- # a link
+ # Link the built library to dependents.
'libraries': [
'libmicrohttpd.a',
],
@@ -27,13 +27,15 @@
{
'action_name': 'configure_and_build',
'inputs': [
- '<(PRODUCT_DIR)/',
+ '<(base_dir)/build.py',
+ '<(src_dir)/.git/HEAD', # This does not support local changes, but does support DEPS.
],
'outputs': [ '<(PRODUCT_DIR)/libmicrohttpd.a' ],
'action': [
'python',
'<(base_dir)/build.py',
'--src', '<(src_dir)',
+ '--out', '<(out_dir)',
'--dst', '<(PRODUCT_DIR)',
],
},
« no previous file with comments | « gyp/json.gyp ('k') | gyp/most.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698