Bug 650390 - osversion in chrome.manifest files should query android os version [r=dtownsend]

This commit is contained in:
Mark Finkle 2011-05-05 16:50:19 -04:00
parent 8ef2432de5
commit d2feafa0a4

View File

@ -49,6 +49,10 @@
#include <gtk/gtk.h>
#endif
#ifdef ANDROID
#include "AndroidBridge.h"
#endif
#include "mozilla/Services.h"
#include "nsConsoleMessage.h"
@ -485,6 +489,10 @@ ParseManifestCommon(NSLocationType aType, nsILocalFile* aFile,
nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
gtk_major_version,
gtk_minor_version);
#elif defined(ANDROID)
if (mozilla::AndroidBridge::Bridge()) {
mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION", "RELEASE", osVersion);
}
#endif
// Because contracts must be registered after CIDs, we save and process them