diff --git a/build/build_gyp.py b/build/build_gyp.py
index e5e4883..0f44959 100644
--- a/build/build_gyp.py
+++ b/build/build_gyp.py
@@ -37,11 +37,14 @@
 args.append('-I' + os.path.join(v8_i18n_root, 'build', 'common.gypi'))
 
 # Necessary for building standalone v8 project.
-args.append('-I' + os.path.join(v8_i18n_root, '..', 'v8', 'build', 'standalone.gypi'))
+args.append('-I' + os.path.join(v8_i18n_root, '..', 'chrome', 'src',
+                                'v8', 'build', 'standalone.gypi'))
 
-# Point to v8 and icu checkouts.
-args.append('-Dicu_path=' + os.path.join(v8_i18n_root, '..', '..', 'icu'))
-args.append('-Dv8_path=' + os.path.join(v8_i18n_root, '..', '..'))
+# Point to v8 and icu checkouts within Chrome (overrides all.gyp).
+args.append('-Dicu_path=' + os.path.join(v8_i18n_root, '..', '..',
+                                         'chrome', 'src', 'third_party', 'icu'))
+args.append('-Dv8_path=' + os.path.join(v8_i18n_root, '..', '..',
+                                        'chrome', 'src'))
 args.append('-Dclang=1')
 
 # ICU build fails if werror is on.
diff --git a/build/common.gypi b/build/common.gypi
index 153b659..045adcf 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -22,8 +22,6 @@
     # V8 should not build target and host
     'want_separate_host_toolset': 0,
     # Allow override to 'shared_library' for DLL/.so builds
-    'library%': 'static_library',
-    # NB. these names match with what V8 expects
     'component%': 'static_library',
 
     'conditions': [