diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 14:36:03 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 14:36:03 +0000 |
| commit | 1c0feabcb212d882d6cb15c6a8c32eb4f1f6e87b (patch) | |
| tree | ecb7d6c70fd203ea140f0804eea42ea38b4f2c75 | |
| parent | 2d9fe795393700cc42552c40974d2bfb6023bade (diff) | |
| download | chromium_src-1c0feabcb212d882d6cb15c6a8c32eb4f1f6e87b.zip chromium_src-1c0feabcb212d882d6cb15c6a8c32eb4f1f6e87b.tar.gz chromium_src-1c0feabcb212d882d6cb15c6a8c32eb4f1f6e87b.tar.bz2 | |
Fix build/mac/edit_xibs.sh.
This removes duplicate files from google_toolbox_for_mac.gyp and fixes up the
script to include common.gypi implicitly.
R=mark@chromium.org
Review URL: https://codereview.chromium.org/258343002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267199 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | build/mac/edit_xibs.sh | 4 | ||||
| -rw-r--r-- | chrome/chrome_nibs.gyp | 1 | ||||
| -rw-r--r-- | third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp | 9 |
3 files changed, 3 insertions, 11 deletions
diff --git a/build/mac/edit_xibs.sh b/build/mac/edit_xibs.sh index 8204591..b7b749e 100755 --- a/build/mac/edit_xibs.sh +++ b/build/mac/edit_xibs.sh @@ -12,6 +12,8 @@ set -e RELSRC=$(dirname "$0")/../.. SRC=$(cd "$RELSRC" && pwd) -GYP_GENERATORS=xcode "$SRC/tools/gyp/gyp" "$SRC/chrome/chrome_nibs.gyp" +export PYTHONPATH="$PYTHONPATH:$SRC/build" +export GYP_GENERATORS=xcode +"$SRC/tools/gyp/gyp" -I"$SRC/build/common.gypi" "$SRC/chrome/chrome_nibs.gyp" echo "You can now edit XIB files in Xcode using:" echo " $SRC/chrome/chrome_nibs.xcodeproj" diff --git a/chrome/chrome_nibs.gyp b/chrome/chrome_nibs.gyp index bf0840d..84b0bf0 100644 --- a/chrome/chrome_nibs.gyp +++ b/chrome/chrome_nibs.gyp @@ -21,7 +21,6 @@ 'chromium_code': 1, }, 'includes': [ - '../build/common.gypi', 'chrome_nibs.gypi', ], 'target_defaults': { diff --git a/third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp b/third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp index 8e188eb..ae3e11f 100644 --- a/third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp +++ b/third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp @@ -167,15 +167,6 @@ 'src/Foundation/GTMURITemplate.m', 'src/Foundation/GTMValidatingContainers.h', 'src/Foundation/GTMValidatingContainers.m', - 'src/Foundation/GTMLogger.h', - 'src/Foundation/GTMLogger.m', - 'src/Foundation/GTMNSNumber+64Bit.h', - 'src/Foundation/GTMNSNumber+64Bit.m', - 'src/Foundation/GTMNSObject+KeyValueObserving.h', - 'src/Foundation/GTMNSObject+KeyValueObserving.m', - 'src/Foundation/GTMObjectSingleton.h', - 'src/Foundation/GTMServiceManagement.c', - 'src/Foundation/GTMServiceManagement.h', 'src/GTMDefines.h', 'src/iPhone/GTMFadeTruncatingLabel.h', 'src/iPhone/GTMFadeTruncatingLabel.m', |