commit 7e5a2e79b848a8c0373d65f2324f5f999a458518
author Colin Cross <ccross@android.com> Tue Mar 31 17:43:27 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 31 17:43:27 2015 +0000
tree 4bedcfdf3b48c520be04030b1175ee2dbaf80ec1
parent a42a6ffd763311472c916072d3c2a99aaa5a2ae5
parent 1da2494f7a98a8e85c9115fb012b798c9facc68f

am 1da2494f: Merge "Remove copied reference to undefined local_javac_flags"

* commit '1da2494f7a98a8e85c9115fb012b798c9facc68f':
  Remove copied reference to undefined local_javac_flags

Android.mk

diff --git a/Android.mk b/Android.mk
index b66fefd..b4bf0aa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -66,7 +66,6 @@
 LOCAL_SRC_FILES += $(core-junit-files)
 LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_JAVA_LIBRARIES := core-libart
-LOCAL_JAVACFLAGS := $(local_javac_flags)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := core-junit
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk
@@ -82,7 +81,6 @@
 # on it
 LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions)
 LOCAL_SRC_FILES += $(core-junit-files)
-LOCAL_JAVACFLAGS := $(local_javac_flags)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := core-junit-hostdex
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk