Use a common directory for all build output on the Mac.

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

3 files changed, 11 insertions, 8 deletions

diff --git a/base/base.xcodeproj/project.pbxproj b/base/base.xcodeproj/project.pbxproj
index 0250fd4..5034843 100644
--- a/base/base.xcodeproj/project.pbxproj
+++ b/base/base.xcodeproj/project.pbxproj
@@ -67,7 +67,7 @@
 		7B836ADE0E55097000F6AD31 /* libicui18n.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B165D4F0E55081400185273 /* libicui18n.a */; };
 		7B836AE30E5509A900F6AD31 /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B165D300E55081000185273 /* libgtest.a */; };
 		7B836C050E55BBB800F6AD31 /* ref_counted.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B836C040E55BBB800F6AD31 /* ref_counted.cc */; };
-		7B836E180E55CE5B00F6AD31 /* libicudatastatic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B836D970E55CE4700F6AD31 /* libicudatastatic.a */; };
+		7B836E180E55CE5B00F6AD31 /* libicudata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B836D970E55CE4700F6AD31 /* libicudata.a */; };
 		7BAF501C0E50B84200CA8A07 /* base_paths.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BAF501B0E50B84200CA8A07 /* base_paths.cc */; };
 		7BAF50760E50B8F100CA8A07 /* file_version_info_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7BAF50740E50B8F100CA8A07 /* file_version_info_mac.mm */; };
 		820EB4F70E3A613F009668FC /* string_piece.cc in Sources */ = {isa = PBXBuildFile; fileRef = 820EB4F50E3A613F009668FC /* string_piece.cc */; };
@@ -509,7 +509,7 @@
 				7B78D40E0E54FE8000609465 /* Foundation.framework in Frameworks */,
 				7B78D38C0E54FDEC00609465 /* libbase.a in Frameworks */,
 				7B836AE30E5509A900F6AD31 /* libgtest.a in Frameworks */,
-				7B836E180E55CE5B00F6AD31 /* libicudatastatic.a in Frameworks */,
+				7B836E180E55CE5B00F6AD31 /* libicudata.a in Frameworks */,
 				7B836ADE0E55097000F6AD31 /* libicui18n.a in Frameworks */,
 				7B836ADD0E55097000F6AD31 /* libicuuc.a in Frameworks */,
 			);
@@ -530,8 +530,8 @@
 			isa = PBXGroup;
 			children = (
 				7B165D530E55081400185273 /* genccode */,
+				7B836D970E55CE4700F6AD31 /* libicudata.a */,
 				7B165D4B0E55081400185273 /* libicudata_stub.a */,
-				7B836D970E55CE4700F6AD31 /* libicudatastatic.a */,
 				7B165D4F0E55081400185273 /* libicui18n.a */,
 				7B165D510E55081400185273 /* libicutu.a */,
 				7B165D4D0E55081400185273 /* libicuuc.a */,
@@ -1009,10 +1009,10 @@
 			remoteRef = 7B165D6D0E55081400185273 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		7B836D970E55CE4700F6AD31 /* libicudatastatic.a */ = {
+		7B836D970E55CE4700F6AD31 /* libicudata.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = libicudatastatic.a;
+			path = libicudata.a;
 			remoteRef = 7B836D960E55CE4700F6AD31 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -1192,6 +1192,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7B836C4D0E55C6AC00F6AD31 /* debug.xcconfig */;
 			buildSettings = {
+				XCODEPROJ_DEPTH = ..;
 			};
 			name = Debug;
 		};
@@ -1199,6 +1200,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7B836C4E0E55C6AC00F6AD31 /* release.xcconfig */;
 			buildSettings = {
+				XCODEPROJ_DEPTH = ..;
 			};
 			name = Release;
 		};
diff --git a/base/base_paths_mac.mm b/base/base_paths_mac.mm
index e5b0c65..e53ba52 100644
--- a/base/base_paths_mac.mm
+++ b/base/base_paths_mac.mm
@@ -64,12 +64,11 @@ bool PathProviderMac(int key, std::wstring* result) {
       break;
     }
     case base::DIR_SOURCE_ROOT:
-      // On the mac, unit tests execute three levels deep from the source root.
-      // For example:  chrome/build/{Debug|Release}/ui_tests
+      // On the mac, unit tests execute two levels deep from the source root.
+      // For example: src/xcodebuild/{Debug|Release}/base_unittests
       PathService::Get(base::DIR_EXE, &cur);
       file_util::UpOneDirectory(&cur);
       file_util::UpOneDirectory(&cur);
-      file_util::UpOneDirectory(&cur);
       break;
     default:
       return false;
diff --git a/testing/gtest.xcodeproj/project.pbxproj b/testing/gtest.xcodeproj/project.pbxproj
index 1e092ed..be50413 100644
--- a/testing/gtest.xcodeproj/project.pbxproj
+++ b/testing/gtest.xcodeproj/project.pbxproj
@@ -159,6 +159,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7B836C750E55C8CC00F6AD31 /* debug.xcconfig */;
 			buildSettings = {
+				XCODEPROJ_DEPTH = ..;
 			};
 			name = Debug;
 		};
@@ -166,6 +167,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7B836C760E55C8CC00F6AD31 /* release.xcconfig */;
 			buildSettings = {
+				XCODEPROJ_DEPTH = ..;
 			};
 			name = Release;
 		};