From c73018c2e91ff689a68257086fe9e52b55976b29 Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@google.com>
Date: Tue, 6 Aug 2013 16:07:13 -0700
Subject: [PATCH] Fix typo from previous change to fix the build

Change-Id: I6cf7217eb81abd794339143b7c23456b68808caf
---
 core/config.mk | 5 +++++
 core/java.mk   | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/config.mk b/core/config.mk
index 460e5c32f..8be539c70 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -408,6 +408,11 @@ HOST_GLOBAL_CPPFLAGS += $(HOST_RELEASE_CPPFLAGS)
 TARGET_GLOBAL_CFLAGS += $(TARGET_RELEASE_CFLAGS)
 TARGET_GLOBAL_CPPFLAGS += $(TARGET_RELEASE_CPPFLAGS)
 
+# allow overriding default Java libraries on a per-target basis
+ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)
+  TARGET_DEFAULT_JAVA_LIBRARIES := core core-junit ext framework framework2
+endif
+
 # define llvm tools and global flags
 include $(BUILD_SYSTEM)/llvm_config.mk
 
diff --git a/core/java.mk b/core/java.mk
index 2d9f1fb36..8abfb39c4 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -43,9 +43,6 @@ ifneq ($(LOCAL_SDK_VERSION),)
   endif
 else
   ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
-    ifeq (TARGET_DEFAULT_JAVA_LIBRARIES,)
-      TARGET_DEFAULT_JAVA_LIBRARIES := core core-junit ext framework framework2
-    endif
     LOCAL_JAVA_LIBRARIES := $(TARGET_DEFAULT_JAVA_LIBRARIES) $(LOCAL_JAVA_LIBRARIES)
   endif
 endif