diff options
| author | Albert J. Wong <ajwong@chromium.org> | 2014-08-26 18:10:24 -0700 |
|---|---|---|
| committer | Albert J. Wong <ajwong@chromium.org> | 2014-08-27 01:14:22 +0000 |
| commit | 8f65982274893958898690b22e1c0c9ed4968857 (patch) | |
| tree | a6e258ea0f77c26bd5c5637a6310d134979526d6 /build/json_schema_compile.gypi | |
| parent | 1a2f0e0889de76e03e14d454fef33711b4be3a3b (diff) | |
| download | chromium_src-8f65982274893958898690b22e1c0c9ed4968857.zip chromium_src-8f65982274893958898690b22e1c0c9ed4968857.tar.gz chromium_src-8f65982274893958898690b22e1c0c9ed4968857.tar.bz2 | |
Revert "Split bundle generation steps so that API registration is generated in browser, not common."
Causing build failure in Android due to failed include for extensions/common/api/runtime.h.
This reverts commit 3b70ef14be986a3252428cc6d9553bf2c69deb70.
BUG=none
TBR=yoz
Review URL: https://codereview.chromium.org/506253003
Cr-Commit-Position: refs/heads/master@{#292059}
Diffstat (limited to 'build/json_schema_compile.gypi')
| -rw-r--r-- | build/json_schema_compile.gypi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build/json_schema_compile.gypi b/build/json_schema_compile.gypi index 9672f79..d164748 100644 --- a/build/json_schema_compile.gypi +++ b/build/json_schema_compile.gypi @@ -15,8 +15,11 @@ # namespace, like "toplevel::%(namespace)s_api". # # Functions and namespaces can be excluded by setting "nocompile" to true. + # The default root path of API implementation sources is + # chrome/browser/extensions/api and can be overridden by setting "impl_dir". 'api_gen_dir': '<(DEPTH)/tools/json_schema_compiler', 'api_gen': '<(api_gen_dir)/compiler.py', + 'impl_dir%': 'chrome/browser/extensions/api', }, 'rules': [ { @@ -54,6 +57,7 @@ '--destdir=<(SHARED_INTERMEDIATE_DIR)', '--namespace=<(root_namespace)', '--generator=cpp', + '--impl-dir=<(impl_dir)' ], 'message': 'Generating C++ code from <(RULE_INPUT_PATH) json files', 'process_outputs_as_sources': 1, @@ -92,6 +96,7 @@ '--destdir=<(SHARED_INTERMEDIATE_DIR)', '--namespace=<(root_namespace)', '--generator=cpp', + '--impl-dir=<(impl_dir)' ], 'message': 'Generating C++ code from <(RULE_INPUT_PATH) IDL files', 'process_outputs_as_sources': 1, |