summaryrefslogtreecommitdiff
path: root/libart
diff options
context:
space:
mode:
authorDoug Horn <doughorn@google.com>2019-01-22 09:16:08 -0800
committerDoug Horn <doughorn@google.com>2019-01-24 11:26:47 -0800
commit302dc0b3e68bf0b30f8cb6237c19064d53363f0f (patch)
treeee47a127ab7eb15afef5d1b3c325b92c3c4877b0 /libart
parentebd71c3d2ed02cab65db168e1adb6d66bfb44f91 (diff)
Remove hardcoded os.name property.
5c9406fb hardcoded "linux" as the value for the os.name property on Android. Because we will now support additional device OSs, this value is no longer static. Reverting back to dynamically querying os.name will regress compile-time initialization for AbstractDatagramSocket. Analysis of this is tracked in b/121268567. Bug: 119271070 Bug: 117987577 Bug: 28174137 Test: Verify os.name keys to the proper underlying OS. Change-Id: I233e87b56b6e5513aab31ef68e1b2afbcd238fc8
Diffstat (limited to 'libart')
-rw-r--r--libart/src/main/java/java/lang/AndroidHardcodedSystemProperties.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/libart/src/main/java/java/lang/AndroidHardcodedSystemProperties.java b/libart/src/main/java/java/lang/AndroidHardcodedSystemProperties.java
index 87c309674a..931994f0aa 100644
--- a/libart/src/main/java/java/lang/AndroidHardcodedSystemProperties.java
+++ b/libart/src/main/java/java/lang/AndroidHardcodedSystemProperties.java
@@ -96,10 +96,6 @@ public final class AndroidHardcodedSystemProperties {
{ "http.keepAliveDuration", null },
{ "http.maxConnections", null },
- // Hardcode "os.name" to "Linux." Aids compile-time initialization, checked in System.
- // b/28174137
- { "os.name", "Linux" },
-
// Turn off javax.net debugging. This allows compile-time initialization of a range
// of classes. b/28174137
{ "javax.net.debug", null },