Update a few targets to the condition they should be in. Eliminate redundant

build settings.  Make sure all executable targets have the proper "strip if
needed" phase.  Fix dependencies.
Review URL: http://codereview.chromium.org/13374

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

2 files changed, 42 insertions, 1 deletions

diff --git a/build/all.xcodeproj/project.pbxproj b/build/all.xcodeproj/project.pbxproj
index 78f1e2d..e75d6a2 100644
--- a/build/all.xcodeproj/project.pbxproj
+++ b/build/all.xcodeproj/project.pbxproj
@@ -43,6 +43,7 @@
 				7BE0EE280E75DAFC002F5776 /* PBXTargetDependency */,
 				7BF8964C0E75D705000BAF8A /* PBXTargetDependency */,
 				7BF895DA0E75D5FB000BAF8A /* PBXTargetDependency */,
+				4DCEA01A0EF0BB3F00682526 /* PBXTargetDependency */,
 				7BA363940E8C40400023C8B9 /* PBXTargetDependency */,
 				7BF8964E0E75D705000BAF8A /* PBXTargetDependency */,
 				4D7B02320E9D57E4009A6919 /* PBXTargetDependency */,
@@ -183,6 +184,20 @@
 			remoteGlobalIDString = E4F325930EE837BF002533CE;
 			remoteInfo = run_ipc_tests;
 		};
+		4DCEA0160EF0BB2F00682526 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4DCEA00F0EF0BB2F00682526 /* npapi_layout_test_plugin.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 826F16DC0EE5DE3800D973C7;
+			remoteInfo = NPAPILayoutTestPlugin;
+		};
+		4DCEA0190EF0BB3F00682526 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4DCEA00F0EF0BB2F00682526 /* npapi_layout_test_plugin.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 826F16DB0EE5DE3800D973C7;
+			remoteInfo = NPAPILayoutTestPlugin;
+		};
 		7B262E390E82E508001CE27F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7BF895A30E75D5DA000BAF8A /* v8.xcodeproj */;
@@ -595,6 +610,7 @@
 		4D7B021C0E9D57D9009A6919 /* sqlite.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sqlite.xcodeproj; path = sqlite/sqlite.xcodeproj; sourceTree = "<group>"; };
 		4D7B02380E9D5816009A6919 /* chrome.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = chrome.xcodeproj; path = chrome/chrome.xcodeproj; sourceTree = "<group>"; };
 		4DB686590EAFE60400AB2128 /* libxslt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libxslt.xcodeproj; path = libxslt/libxslt.xcodeproj; sourceTree = "<group>"; };
+		4DCEA00F0EF0BB2F00682526 /* npapi_layout_test_plugin.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = npapi_layout_test_plugin.xcodeproj; path = webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.xcodeproj; sourceTree = "<group>"; };
 		7B262FE50E82F18D001CE27F /* libevent.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libevent.xcodeproj; path = libevent/libevent.xcodeproj; sourceTree = "<group>"; };
 		7BA3548E0E89784F0023C8B9 /* TestShell.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = TestShell.xcodeproj; path = webkit/tools/test_shell/mac/TestShell.xcodeproj; sourceTree = "<group>"; };
 		7BA3638D0E8C402F0023C8B9 /* sdch.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sdch.xcodeproj; path = sdch/sdch.xcodeproj; sourceTree = "<group>"; };
@@ -650,6 +666,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		4DCEA0100EF0BB2F00682526 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				4DCEA0170EF0BB2F00682526 /* NPAPILayoutTestPlugin.bundle */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		7B262FE60E82F18D001CE27F /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -712,6 +736,7 @@
 				7BF895A00E75D5DA000BAF8A /* googleurl.xcodeproj */,
 				7BF896510E75D753000BAF8A /* gtest.xcodeproj */,
 				7BF8957F0E75D5C6000BAF8A /* net.xcodeproj */,
+				4DCEA00F0EF0BB2F00682526 /* npapi_layout_test_plugin.xcodeproj */,
 				7BA3638D0E8C402F0023C8B9 /* sdch.xcodeproj */,
 				7BF895E20E75D628000BAF8A /* skia.xcodeproj */,
 				7BA3548E0E89784F0023C8B9 /* TestShell.xcodeproj */,
@@ -942,6 +967,10 @@
 					ProjectRef = 7BF8957F0E75D5C6000BAF8A /* net.xcodeproj */;
 				},
 				{
+					ProductGroup = 4DCEA0100EF0BB2F00682526 /* Products */;
+					ProjectRef = 4DCEA00F0EF0BB2F00682526 /* npapi_layout_test_plugin.xcodeproj */;
+				},
+				{
 					ProductGroup = 7BA3638E0E8C402F0023C8B9 /* Products */;
 					ProjectRef = 7BA3638D0E8C402F0023C8B9 /* sdch.xcodeproj */;
 				},
@@ -1049,6 +1078,13 @@
 			remoteRef = 4DCE99660EF0603800682526 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		4DCEA0170EF0BB2F00682526 /* NPAPILayoutTestPlugin.bundle */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = NPAPILayoutTestPlugin.bundle;
+			remoteRef = 4DCEA0160EF0BB2F00682526 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		7B262E3A0E82E508001CE27F /* libv8-arm.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1365,6 +1401,11 @@
 			name = run_ipc_tests;
 			targetProxy = 4DCE997B0EF060B100682526 /* PBXContainerItemProxy */;
 		};
+		4DCEA01A0EF0BB3F00682526 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = NPAPILayoutTestPlugin;
+			targetProxy = 4DCEA0190EF0BB3F00682526 /* PBXContainerItemProxy */;
+		};
 		7B2630020E82F19B001CE27F /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = libevent;
diff --git a/build/dynamiclib.xcconfig b/build/dynamiclib.xcconfig
index 5096ebc..73d398b 100644
--- a/build/dynamiclib.xcconfig
+++ b/build/dynamiclib.xcconfig
@@ -6,4 +6,4 @@
 GCC_DYNAMIC_NO_PIC = NO
 
 // Dynamic libs should not have their external symbols stripped.
-STRIP_STYLE = non-global
\ No newline at end of file
+STRIP_STYLE = non-global