diff options
| author | Andy McFadden <fadden@android.com> | 2009-08-21 13:03:31 -0700 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2009-08-21 13:03:31 -0700 |
| commit | 48a96f5133f33adaadbc0187503a35f03f1348ac (patch) | |
| tree | 4b4b802f769f3285582be5ee09da117adeac897f | |
| parent | c26bb63b50c7a855d25b396b1bf23a3aa6929b48 (diff) | |
| download | android_dalvik-48a96f5133f33adaadbc0187503a35f03f1348ac.tar.gz android_dalvik-48a96f5133f33adaadbc0187503a35f03f1348ac.tar.bz2 android_dalvik-48a96f5133f33adaadbc0187503a35f03f1348ac.zip | |
Set os.arch property from uname().machine.
Not sure why we didn't just do this in the first place. I get "x86_64"
on desktop and "armv6l" on a sapphire.
| -rw-r--r-- | vm/Properties.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/vm/Properties.c b/vm/Properties.c index 9cfa02216..91288c27f 100644 --- a/vm/Properties.c +++ b/vm/Properties.c @@ -187,14 +187,7 @@ void dvmCreateDefaultProperties(Object* propObj) setProperty(propObj, put, "java.specification.vendor", projectName); setProperty(propObj, put, "java.specification.version", "0.9"); - #define OS_ARCH generic /* TODO: Use an "arch" header. */ - #define OS_ARCH_QUOTE1(x) #x - #define OS_ARCH_QUOTE(x) OS_ARCH_QUOTE1(x) - setProperty(propObj, put, "os.arch", OS_ARCH_QUOTE(OS_ARCH)); - #undef OS_ARCH - #undef OS_ARCH_QUOTE1 - #undef OS_ARCH_QUOTE - + setProperty(propObj, put, "os.arch", info.machine); setProperty(propObj, put, "os.name", info.sysname); setProperty(propObj, put, "os.version", info.release); setProperty(propObj, put, "user.home", getenv("HOME")); |