AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-11491 adjust Java version check for Android.

Browse Source 
R=markus.icu@gmail.com

Review URL: https://codereview.appspot.com/194320043

X-SVN-Rev: 36978
This commit is contained in:
Fredrik Roubert 2015-01-21 21:46:16 +00:00
parent 2e44f6274f
commit c65976304f
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
icu4j/main/tests/core/src/com/ibm/icu/dev/test/bigdec/DiagBigDecimal.java
View File

@ -1,12 +1,20 @@
/*
*******************************************************************************
* Copyright (C) 2000-2015, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
/* Generated from 'DiagBigDecimal.nrx' 27 Mar 2000 22:38:44 [v1.162] */ /* Generated from 'DiagBigDecimal.nrx' 27 Mar 2000 22:38:44 [v1.162] */
/* Options: Binary Comments Crossref Format Java Logo Trace1 Verbose3 */ /* Options: Binary Comments Crossref Format Java Logo Trace1 Verbose3 */
/* The generated code has been manually modified. */
package com.ibm.icu.dev.test.bigdec; package com.ibm.icu.dev.test.bigdec;
import java.math.BigInteger; import java.math.BigInteger;
import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.TestFmwk;
import com.ibm.icu.dev.test.TestUtil;
import com.ibm.icu.dev.test.TestUtil.JavaVendor;
import com.ibm.icu.math.BigDecimal; import com.ibm.icu.math.BigDecimal;
import com.ibm.icu.util.VersionInfo;
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
/* Decimal diagnostic tests mfc */ /* Decimal diagnostic tests mfc */
@ -154,8 +162,9 @@ public class DiagBigDecimal extends TestFmwk {
super(); super();
} }
static final boolean isJDK15OrLater = VersionInfo.javaVersion().compareTo( static final boolean isJDK15OrLater =
VersionInfo.getInstance(1, 5)) >= 0; TestUtil.getJavaVendor() == JavaVendor.Android ||
TestUtil.getJavaVersion() >= 5;
/** /**
* Run the tests in the test suite. * Run the tests in the test suite.