From 8f65982274893958898690b22e1c0c9ed4968857 Mon Sep 17 00:00:00 2001
From: "Albert J. Wong" <ajwong@chromium.org>
Date: Tue, 26 Aug 2014 18:10:24 -0700
Subject: 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}
---
 ui/accessibility/BUILD.gn          | 3 ++-
 ui/accessibility/accessibility.gyp | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'ui/accessibility')

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': {
-- 
cgit v1.1