diff options
| author | 2016-10-06 08:43:42 +0000 | |
|---|---|---|
| committer | 2016-10-06 08:43:42 +0000 | |
| commit | c611842e1ca2d44922ef6acfe2d38e0143e8045b (patch) | |
| tree | 2752c8c21fac335f80ec55d5585a57423687e8af | |
| parent | 84b7932077ece65f702d77614f168c256f5684cc (diff) | |
| parent | 6a3c315b2526143bf4c54fbb35d90e8907b1c3d4 (diff) | |
Merge "Remove .mk lines that are just setting the default" am: 8873c3821d
am: 6a3c315b25
Change-Id: I24bd59700cd8b362691115e725cbf11e6accdedc
| -rw-r--r-- | core/tests/systemproperties/Android.mk | 1 | ||||
| -rw-r--r-- | media/tests/MediaFrameworkTest/Android.mk | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/core/tests/systemproperties/Android.mk b/core/tests/systemproperties/Android.mk index ffc12825ce2b..e16c3678dee7 100644 --- a/core/tests/systemproperties/Android.mk +++ b/core/tests/systemproperties/Android.mk @@ -11,7 +11,6 @@ LOCAL_SRC_FILES := \ LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := FrameworksCoreSystemPropertiesTests -LOCAL_JAVA_LANGUAGE_VERSION := 1.8 LOCAL_CERTIFICATE := platform diff --git a/media/tests/MediaFrameworkTest/Android.mk b/media/tests/MediaFrameworkTest/Android.mk index 7e438a12f31b..29557beb66c6 100644 --- a/media/tests/MediaFrameworkTest/Android.mk +++ b/media/tests/MediaFrameworkTest/Android.mk @@ -7,8 +7,6 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_JAVA_LANGUAGE_VERSION := 1.8 - LOCAL_STATIC_JAVA_LIBRARIES := easymocklib \ mockito-target \ android-support-test \ |