2 files changed, 19 insertions, 9 deletions
diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript
index 1cc3232..64b770d 100644
--- a/chrome/installer/mini_installer/SConscript
+++ b/chrome/installer/mini_installer/SConscript
@@ -130,6 +130,15 @@ env_test.Prepend(
         '$GTEST_DIR',
         '#/..',
     ],
+    LIBS = [
+        'gtest',
+        'icuuc',
+        'common',
+        'base',
+    ],
+)
+
+env_test.Prepend(
     LINKFLAGS = [
         '/INCREMENTAL',
         '/DEBUG',
@@ -168,10 +177,6 @@ input_files = [
 
 libs = [
     '../util/util.lib',
-    '$TESTING_DIR/gtest.lib',
-    '$ICU38_DIR/icuuc.lib',
-    '$CHROME_DIR/common/common.lib',
-    '$BASE_DIR/base.lib',
 ]
 
 exe = env_test.ChromeTestProgram(['installer_unittests',
diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript
index f4b2048..3f71843 100644
--- a/chrome/installer/setup/SConscript
+++ b/chrome/installer/setup/SConscript
@@ -58,6 +58,16 @@ env.Prepend(
         '.',
         '#/..',
     ],
+    LIBS = [
+        'bspatch',
+        'lzma_sdk',
+        'icuuc',
+        'common',
+        'base',
+    ],
+)
+
+env.Prepend(
     LINKFLAGS = [
         '/INCREMENTAL',
         '/DEBUG',
@@ -94,11 +104,6 @@ input_files = [
 
 libs = [
     '../util/util.lib',
-    '$BSPATCH_DIR/bspatch.lib',
-    '$LZMA_SDK_DIR/lzma_sdk.lib',
-    '$ICU38_DIR/icuuc.lib',
-    '$CHROME_DIR/common/common.lib',
-    '$BASE_DIR/base.lib',
 ]
 
 exe = env.ChromeProgram(['setup',