Make clang_load and clang_add_plugin independent.

BUG=none
TEST=GYP_DEFINES=clang_add_plugin=foo build/gyp_chromium adds a parameter


Review URL: http://codereview.chromium.org/8772034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112630 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -1915,9 +1915,13 @@
               '<(clang_chrome_plugins_flags)',
             ],
           }],
-          ['clang==1 and clang_load!="" and clang_add_plugin!=""', {
+          ['clang==1 and clang_load!=""', {
             'cflags': [
               '-Xclang', '-load', '-Xclang', '<(clang_load)',
+            ],
+          }],
+          ['clang==1 and clang_add_plugin!=""', {
+            'cflags': [
               '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)',
             ],
           }],
@@ -2265,9 +2269,13 @@
                 '<(clang_chrome_plugins_flags)',
               ],
             }],
-            ['clang==1 and clang_load!="" and clang_add_plugin!=""', {
+            ['clang==1 and clang_load!=""', {
               'OTHER_CFLAGS': [
                 '-Xclang', '-load', '-Xclang', '<(clang_load)',
+              ],
+            }],
+            ['clang==1 and clang_add_plugin!=""', {
+              'OTHER_CFLAGS': [
                 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)',
               ],
             }],