More build tools improvements

manifest.json.tmpl

 /*
  * This file is part of the Adblock Plus extension,
  * Copyright (C) 2006-2012 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 15 matching lines @@
   "minimum_chrome_version": {{metadata.get('compat', 'chrome')|json}},
   {%- endif %}
 
   {%- if not releaseBuild %}
   "update_url": "https://adblockplus.org/devbuilds/
     {{- metadata.get('general', 'basename') -}}
     {%- if experimentalAPI -%}
     -experimental
     {%- endif -%}
     /updates.xml",
+  {%- elif metadata.has_option('general', 'updateURL') %}
+  "update_url": {{metadata.get('general', 'updateURL')|json}},
   {%- endif %}
 
   {%- if pageAction %}
   "page_action": {
     "default_icon": {{pageAction.icon|json}},
     "default_title": "__MSG_name__",
     "default_popup": {{pageAction.popup|json}}
   },
+  {%- endif %}
+
+  {%- if metadata.has_option('general', 'browserAction') and metadata.get('general', 'browserAction') != '' %}
+  "browser_action": {},
   {%- endif %}
 
   {%- if icons %}
   "icons": {{icons|json}},
   {%- endif %}
 
   {%- if permissions %}
   "permissions": {{permissions|json}},
   {%- endif %}
 
@@ skipping 10 matching lines @@
   {%- if contentScripts %}
   "content_scripts": {{contentScripts|json}},
   {%- endif %}
 
   {%- if webAccessible %}
   "web_accessible_resources": {{webAccessible|json}},
   {%- endif %}
 
   "_dummy": false
 }