USE_AURA=1 Reveals circular dependencies on Mac.

This changes Aura related .gyp files to conditionally depend on the chrome.gyp:packed_resources target, which is non-Mac target.
Also, this unifies mixed "../..", "..", and "<(DEPTH)" usage to prefer the ".." form from advice from mento@.

BUG=None
TEST=build/gyp_chromium completes on Mac. Compiles and passes existing tests on other platforms.

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

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

1 files changed, 14 insertions, 8 deletions

diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index f6496636..5b70c14 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -76,14 +76,13 @@
       'target_name': 'aura_unittests',
       'type': 'executable',
       'dependencies': [
-        '<(DEPTH)/base/base.gyp:test_support_base',
-        '<(DEPTH)/chrome/chrome.gyp:packed_resources',
-        '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-        '<(DEPTH)/ui/ui.gyp:gfx_resources',
-        '<(DEPTH)/ui/ui.gyp:ui',
-        '<(DEPTH)/ui/ui.gyp:ui_resources',
-        '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
+        '../../base/base.gyp:test_support_base',
+        '../../skia/skia.gyp:skia',
+        '../../testing/gtest.gyp:gtest',
+        '../gfx/gl/gl.gyp:gl',
+        '../ui.gyp:gfx_resources',
+        '../ui.gyp:ui',
+        '../ui.gyp:ui_resources',
         'aura',
       ],
       'include_dirs': [
@@ -97,6 +96,13 @@
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
       ],
+      'conditions': [
+        ['OS!="mac"', {
+          'dependencies': [
+            '../../chrome/chrome.gyp:packed_resources',
+           ],
+        }],
+      ],
     },
   ],
 }