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 /ui/accessibility | |
| 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 'ui/accessibility')
| -rw-r--r-- | ui/accessibility/BUILD.gn | 3 | ||||
| -rw-r--r-- | ui/accessibility/accessibility.gyp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn index 2628bce..32a4f71 100644 --- a/ui/accessibility/BUILD.gn +++ b/ui/accessibility/BUILD.gn @@ -77,5 +77,6 @@ generated_extensions_api("ax_gen") { sources = [ "ax_enums.idl" ] deps = [ "//base/third_party/dynamic_annotations" ] root_namespace = "ui" - schemas = true + impl_dir = "." + bundle = true } diff --git a/ui/accessibility/accessibility.gyp b/ui/accessibility/accessibility.gyp index 086f194..33032d7a 100644 --- a/ui/accessibility/accessibility.gyp +++ b/ui/accessibility/accessibility.gyp @@ -97,6 +97,7 @@ ], 'msvs_disabled_warnings': [ 4267 ], 'includes': [ + '../../build/json_schema_bundle_compile.gypi', '../../build/json_schema_compile.gypi', ], 'variables': { |