Remove .mk lines that are just setting the default
1.8 is now the default unless targeting an old SDK.
Bug: 31944681
Test: make checkbuild
Change-Id: Ic1fb42cb627270a1d5641607a193c8f65dbeaca4
diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk
index a52ea7a..3df6117 100644
--- a/apps/CtsVerifier/Android.mk
+++ b/apps/CtsVerifier/Android.mk
@@ -50,8 +50,6 @@
LOCAL_DEX_PREOPT := false
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-
include $(BUILD_PACKAGE)
# Build CTS verifier framework as a libary.
diff --git a/tests/core/libcore/com/Android.mk b/tests/core/libcore/com/Android.mk
index c1df39a..db08dbd 100644
--- a/tests/core/libcore/com/Android.mk
+++ b/tests/core/libcore/com/Android.mk
@@ -17,5 +17,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.com
LOCAL_STATIC_JAVA_LIBRARIES := core-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/conscrypt/Android.mk b/tests/core/libcore/conscrypt/Android.mk
index 55beb9d..7428bf0 100644
--- a/tests/core/libcore/conscrypt/Android.mk
+++ b/tests/core/libcore/conscrypt/Android.mk
@@ -21,5 +21,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.conscrypt
LOCAL_STATIC_JAVA_LIBRARIES := conscrypt-tests mockito-target-minus-junit4
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/dalvik/Android.mk b/tests/core/libcore/dalvik/Android.mk
index 501c674..42d14f3 100644
--- a/tests/core/libcore/dalvik/Android.mk
+++ b/tests/core/libcore/dalvik/Android.mk
@@ -17,5 +17,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.dalvik
LOCAL_STATIC_JAVA_LIBRARIES := core-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/harmony_annotation/Android.mk b/tests/core/libcore/harmony_annotation/Android.mk
index 6746cf3..e9f716e 100644
--- a/tests/core/libcore/harmony_annotation/Android.mk
+++ b/tests/core/libcore/harmony_annotation/Android.mk
@@ -21,5 +21,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.harmony_annotation
LOCAL_STATIC_JAVA_LIBRARIES := core-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/harmony_java_io/Android.mk b/tests/core/libcore/harmony_java_io/Android.mk
index 3108f30..a8d4fa0 100644
--- a/tests/core/libcore/harmony_java_io/Android.mk
+++ b/tests/core/libcore/harmony_java_io/Android.mk
@@ -21,5 +21,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.harmony_java_io
LOCAL_STATIC_JAVA_LIBRARIES := core-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/harmony_java_lang/Android.mk b/tests/core/libcore/harmony_java_lang/Android.mk
index e333708..8b1bdff 100644
--- a/tests/core/libcore/harmony_java_lang/Android.mk
+++ b/tests/core/libcore/harmony_java_lang/Android.mk
@@ -21,5 +21,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.harmony_java_lang
LOCAL_STATIC_JAVA_LIBRARIES := core-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/harmony_java_math/Android.mk b/tests/core/libcore/harmony_java_math/Android.mk
index 5889f85..8310743 100644
--- a/tests/core/libcore/harmony_java_math/Android.mk
+++ b/tests/core/libcore/harmony_java_math/Android.mk
@@ -21,5 +21,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.harmony_java_math
LOCAL_STATIC_JAVA_LIBRARIES := core-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/harmony_java_net/Android.mk b/tests/core/libcore/harmony_java_net/Android.mk
index 95218c4..7917bcc 100644
--- a/tests/core/libcore/harmony_java_net/Android.mk
+++ b/tests/core/libcore/harmony_java_net/Android.mk
@@ -21,5 +21,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.harmony_java_net
LOCAL_STATIC_JAVA_LIBRARIES := core-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/harmony_java_nio/Android.mk b/tests/core/libcore/harmony_java_nio/Android.mk
index 5bdfd17..2c6f673 100644
--- a/tests/core/libcore/harmony_java_nio/Android.mk
+++ b/tests/core/libcore/harmony_java_nio/Android.mk
@@ -21,5 +21,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.harmony_java_nio
LOCAL_STATIC_JAVA_LIBRARIES := core-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/harmony_java_text/Android.mk b/tests/core/libcore/harmony_java_text/Android.mk
index 21113e5..ecd1574 100644
--- a/tests/core/libcore/harmony_java_text/Android.mk
+++ b/tests/core/libcore/harmony_java_text/Android.mk
@@ -21,5 +21,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.harmony_java_text
LOCAL_STATIC_JAVA_LIBRARIES := core-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/harmony_java_util/Android.mk b/tests/core/libcore/harmony_java_util/Android.mk
index f34295e..6d7bded 100644
--- a/tests/core/libcore/harmony_java_util/Android.mk
+++ b/tests/core/libcore/harmony_java_util/Android.mk
@@ -21,5 +21,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.harmony_java_util
LOCAL_STATIC_JAVA_LIBRARIES := core-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/harmony_javax_security/Android.mk b/tests/core/libcore/harmony_javax_security/Android.mk
index fce594b..011940d 100644
--- a/tests/core/libcore/harmony_javax_security/Android.mk
+++ b/tests/core/libcore/harmony_javax_security/Android.mk
@@ -21,5 +21,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.harmony_javax_security
LOCAL_STATIC_JAVA_LIBRARIES := core-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/harmony_logging/Android.mk b/tests/core/libcore/harmony_logging/Android.mk
index 69a8e3a..2ec10f1 100644
--- a/tests/core/libcore/harmony_logging/Android.mk
+++ b/tests/core/libcore/harmony_logging/Android.mk
@@ -21,5 +21,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.harmony_logging
LOCAL_STATIC_JAVA_LIBRARIES := apache-harmony-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/libcore/Android.mk b/tests/core/libcore/libcore/Android.mk
index c9aea5e..baee5f6 100644
--- a/tests/core/libcore/libcore/Android.mk
+++ b/tests/core/libcore/libcore/Android.mk
@@ -20,5 +20,4 @@
# android.test.runner (which might pull in a different version from the
# one that would be pulled in here).
LOCAL_STATIC_JAVA_LIBRARIES := core-tests mockito-target-minus-junit4
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/org/Android.mk b/tests/core/libcore/org/Android.mk
index d174f98..0f3f0ca 100644
--- a/tests/core/libcore/org/Android.mk
+++ b/tests/core/libcore/org/Android.mk
@@ -17,5 +17,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.org
LOCAL_STATIC_JAVA_LIBRARIES := core-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/sun/Android.mk b/tests/core/libcore/sun/Android.mk
index 2fa1520..ed6d2c7 100644
--- a/tests/core/libcore/sun/Android.mk
+++ b/tests/core/libcore/sun/Android.mk
@@ -17,5 +17,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.sun
LOCAL_STATIC_JAVA_LIBRARIES := core-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/libcore/tests/Android.mk b/tests/core/libcore/tests/Android.mk
index 6429558..1d00b06 100644
--- a/tests/core/libcore/tests/Android.mk
+++ b/tests/core/libcore/tests/Android.mk
@@ -17,5 +17,4 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := android.core.tests.libcore.package.tests
LOCAL_STATIC_JAVA_LIBRARIES := core-tests mockito-target-minus-junit4
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_CTSCORE_PACKAGE)
diff --git a/tests/core/runner/Android.mk b/tests/core/runner/Android.mk
index 9229b55..b627b2a 100644
--- a/tests/core/runner/Android.mk
+++ b/tests/core/runner/Android.mk
@@ -27,8 +27,6 @@
LOCAL_STATIC_JAVA_LIBRARIES := cts-test-runner
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-
include $(BUILD_CTSCORE_PACKAGE)
#==========================================================
@@ -48,8 +46,6 @@
vogarexpect \
testng
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-
include $(BUILD_STATIC_JAVA_LIBRARY)
#==========================================================
diff --git a/tests/libcore/jsr166/Android.mk b/tests/libcore/jsr166/Android.mk
index 36cd639..e71bb57 100644
--- a/tests/libcore/jsr166/Android.mk
+++ b/tests/libcore/jsr166/Android.mk
@@ -42,6 +42,4 @@
libcore/expectations/knownfailures.txt \
libcore/expectations/taggedtests.txt
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-
include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/tests/libcore/luni/Android.mk b/tests/libcore/luni/Android.mk
index fa76329..4d36f9f 100644
--- a/tests/libcore/luni/Android.mk
+++ b/tests/libcore/luni/Android.mk
@@ -55,6 +55,4 @@
libcore/expectations/taggedtests.txt \
libcore/expectations/virtualdeviceknownfailures.txt
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-
include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/tests/libcore/ojluni/Android.mk b/tests/libcore/ojluni/Android.mk
index 4311b57..c2ba33b 100644
--- a/tests/libcore/ojluni/Android.mk
+++ b/tests/libcore/ojluni/Android.mk
@@ -47,6 +47,4 @@
libcore/expectations/knownfailures.txt \
libcore/expectations/taggedtests.txt
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-
include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/tests/libcore/okhttp/Android.mk b/tests/libcore/okhttp/Android.mk
index ad78841..840f1a2 100644
--- a/tests/libcore/okhttp/Android.mk
+++ b/tests/libcore/okhttp/Android.mk
@@ -48,6 +48,4 @@
libcore/expectations/knownfailures.txt \
libcore/expectations/taggedtests.txt
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-
include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/tests/libcore/runner/Android.mk b/tests/libcore/runner/Android.mk
index b338e12..d7399cd 100644
--- a/tests/libcore/runner/Android.mk
+++ b/tests/libcore/runner/Android.mk
@@ -35,6 +35,4 @@
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-
include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/tests/tests/libcoreoj/Android.mk b/tests/tests/libcoreoj/Android.mk
index 4e289b8..e2af4af 100644
--- a/tests/tests/libcoreoj/Android.mk
+++ b/tests/tests/libcoreoj/Android.mk
@@ -24,7 +24,6 @@
LOCAL_CTS_TEST_PACKAGE := android.libcore.oj
LOCAL_CTS_TARGET_RUNTIME_ARGS := cts_jdwp_test_runtime_target := dalvikvm|\#ABI\#|
LOCAL_CTS_TESTCASE_XML_INPUT := $(LOCAL_PATH)/CtsTestPackage.xml
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
# Also include the source code as part of the jar. DO NOT REMOVE.
# FIXME: build/core/java_library.mk:14: *** cts/tests/tests/libcoreoj: Target java libraries may not set LOCAL_ASSET_DIR.
#LOCAL_ASSET_DIR := libcore/ojluni/src/test