Android resource PAKs and native lib file path changes.

chrome/common/chrome_paths.cc

Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 9409bd4ee0880443991e897ca210eae8eded5d27..8efd0de7474f778bc857ca8ede7bd09dda9d9c0e 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -14,6 +14,10 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 
+#if defined(OS_ANDROID)

[brettw, 2012/08/02 19:38:53]

I'd not bother with this ifdef and put the include in the group above. Generally
we only put the includes in an ifdef that won't compile, which keeps things a
bit easier to follow for files with a lot of ifdefs.

[benm (inactive), 2012/08/03 11:11:11]

Done.

+#include "ui/base/ui_base_paths.h"
+#endif
+
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif
@@ -312,11 +316,15 @@ bool PathProvider(int key, FilePath* result) {
                  .Append(FILE_PATH_LITERAL("resources.pak"));
         break;
       }
-      // If we're not bundled on mac, resources.pak should be next to the
-      // binary (e.g., for unit tests).
-#endif
+#elif defined(OS_ANDROID)
+      if (!PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &cur))
+        return false;
+#else
+      // If we're not bundled on mac or Android, resources.pak should be next
+      // to the binary (e.g., for unit tests).
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;
+#endif
       cur = cur.Append(FILE_PATH_LITERAL("resources.pak"));
       break;
     case chrome::DIR_RESOURCES_EXTENSION: