Android: Allow compiling browser without Java UI

chrome/browser/ui/webui/version_ui.cc

Index: chrome/browser/ui/webui/version_ui.cc
diff --git a/chrome/browser/ui/webui/version_ui.cc b/chrome/browser/ui/webui/version_ui.cc
index 4fc5a9cc2b4534e37981781ea808207b104e5098..c7c1ca15c5b524c71dba25b1837672bcfd73166a 100644
--- a/chrome/browser/ui/webui/version_ui.cc
+++ b/chrome/browser/ui/webui/version_ui.cc
@@ -31,7 +31,7 @@
 #include "chrome/browser/ui/webui/theme_source.h"
 #endif
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 #include "base/android/build_info.h"
 #include "chrome/browser/ui/android/android_about_app_info.h"
 #endif
@@ -64,7 +64,7 @@ WebUIDataSource* CreateVersionUIDataSource() {
   html_source->AddString(version_ui::kJSEngine, "V8");
   html_source->AddString(version_ui::kJSVersion, v8::V8::GetVersion());
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   html_source->AddString(version_ui::kOSVersion,
                          AndroidAboutAppInfo::GetOsInfo());

[Ted C, 2015/11/30 19:39:05]

will want this to be OS_ANDROID at least

[no sievers, 2015/11/30 23:56:34]

Done. I reverted all changes to this file.

   html_source->AddLocalizedString(version_ui::kBuildIDName,
@@ -76,7 +76,7 @@ WebUIDataSource* CreateVersionUIDataSource() {
   // Note that the Flash version is retrieve asynchronously and returned in
   // VersionHandler::OnGotPlugins. The area is initially blank.
   html_source->AddString(version_ui::kFlashVersion, std::string());
-#endif  // defined(OS_ANDROID)
+#endif  // defined(ANDROID_JAVA_UI)
 
   html_source->AddLocalizedString(version_ui::kCompany,
                                   IDS_ABOUT_VERSION_COMPANY_NAME);