3 files changed, 2 insertions, 33 deletions
diff --git a/o3d/plugin/branding.gypi b/o3d/plugin/branding.gypi
deleted file mode 100644
index 93335c8..0000000
--- a/o3d/plugin/branding.gypi
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'variables': {
-    # Default identity. Can be overridden to allow making custom
-    # plugins based on O3D, but they will not work with regular O3D apps.
-    'plugin_name%': 'O3D Plugin',
-    'plugin_npapi_filename%': 'npo3dautoplugin',
-    'plugin_npapi_mimetype%': 'application/vnd.o3d.auto',
-    'plugin_activex_hostcontrol_clsid%': '9666A772-407E-4F90-BC37-982E8160EB2D',
-    'plugin_activex_typelib_clsid%': 'D4F6E31C-E952-48FE-9833-6AE308BD79C6',
-    'plugin_activex_hostcontrol_name%': 'o3d_host',
-    'plugin_activex_typelib_name%': 'npapi_host2',
-    'plugin_installdir_csidl%': 'CSIDL_APPDATA',
-    'plugin_vendor_directory%': 'Google',
-    'plugin_product_directory%': 'O3D',
-    # You must set this to 1 if changing any of the above.
-    'plugin_rebranded%': '0',
-  }
-}
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp
index f43511a..9914c10 100644
--- a/o3d/plugin/plugin.gyp
+++ b/o3d/plugin/plugin.gyp
@@ -60,9 +60,9 @@
     'plugin_domain_whitelist%': '',
   },
   'includes': [
+    '../build/branding.gypi',
     '../build/common.gypi',
-    'branding.gypi',
-    'version.gypi',
+    '../build/version.gypi',
   ],
   'target_defaults': {
     'include_dirs': [
diff --git a/o3d/plugin/version.gypi b/o3d/plugin/version.gypi
deleted file mode 100644
index 2c57d45..0000000
--- a/o3d/plugin/version.gypi
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'variables': {
-    'plugin_version': '0.1.43.3',
-  }
-}