commit c91767c3ab04ea4f2d829f7d66109c38213a2b15
author Lucas Eckels <eckels@google.com> Fri Aug 10 16:41:10 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 10 16:41:10 2012 -0700
tree 3bcb6b60faccee7e20f188ad0ee9d9f72d3ab302
parent 09d9363008f74880db27522ad763cbd27a7ccaef
parent 925acc90253f7759f093d3398a31e49bb6b26384

Merge "Update apr-util Windows project for renamed dep paths." into jumper

aprutil.vcproj

diff --git a/aprutil.vcproj b/aprutil.vcproj
index e96568f..76cf6a1 100644
--- a/aprutil.vcproj
+++ b/aprutil.vcproj
@@ -42,7 +42,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

-				AdditionalIncludeDirectories="./include;&quot;../apr-1.2.12/include&quot;;./include/private;&quot;../apr-iconv/include&quot;;./dbm/sdbm;&quot;$(ProjectDir)..\expat\lib&quot;"

+				AdditionalIncludeDirectories="./include;&quot;../apache-apr/include&quot;;./include/private;&quot;../apr-iconv/include&quot;;./dbm/sdbm;&quot;$(ProjectDir)..\expat\lib&quot;"

 				PreprocessorDefinitions="NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC;API_DECLARE_STATIC;APU_USE_SDBM;XML_STATIC;WIN32;_WINDOWS"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -106,7 +106,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/EHsc "

-				AdditionalIncludeDirectories="./include;&quot;../apr-1.2.12/include&quot;;./include/private;&quot;../apr-iconv/include&quot;;./dbm/sdbm;&quot;$(ProjectDir)..\expat\lib&quot;"

+				AdditionalIncludeDirectories="./include;&quot;../apache-apr/include&quot;;./include/private;&quot;../apr-iconv/include&quot;;./dbm/sdbm;&quot;$(ProjectDir)..\expat\lib&quot;"

 				PreprocessorDefinitions="_DEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC;API_DECLARE_STATIC;APU_USE_SDBM;XML_STATIC;WIN32;_WINDOWS"

 				RuntimeLibrary="3"

 				PrecompiledHeaderFile=""