commit e1926260486707b3941b5488e97307f7904d1c99
author Ying Wang <wangying@google.com> Tue Sep 28 16:18:03 2010 -0700
committer Ying Wang <wangying@google.com> Tue Sep 28 16:18:03 2010 -0700
tree a35ae966125738e89119f44bfcc7118528fd6907
parent bb2b82bd557b157fea5e280ef50ee782d15ac032

Treat prebuilt SDKs and the stub as normal java libraries.

Change-Id: Ic5512b952d8218e63e40aeb07966de21391ef42d

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 206c087..fbdc4ac 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -381,20 +381,8 @@
 full_java_lib_deps := $(full_java_libs)
 endif # LOCAL_BUILD_HOST_DEX
 else
-ifdef LOCAL_SDK_VERSION
-ifneq ($(LOCAL_SDK_VERSION),current)
-full_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
-# For prebuilt sdk versions, we can't depend on the javalib.jar but classes.jar.
-full_java_lib_deps := $(call java-lib-deps,$(filter-out sdk_v$(LOCAL_SDK_VERSION),$(LOCAL_JAVA_LIBRARIES)),$(LOCAL_IS_HOST_MODULE))
-full_java_lib_deps += $(call java-lib-files,sdk_v$(LOCAL_SDK_VERSION),$(LOCAL_IS_HOST_MODULE))
-else
 full_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
 full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
-endif # !current
-else
-full_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
-full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
-endif # LOCAL_SDK_VERSION
 endif # !LOCAL_IS_HOST_MODULE
 full_java_libs += $(full_static_java_libs) $(LOCAL_CLASSPATH)
 full_java_lib_deps += $(full_static_java_libs) $(LOCAL_CLASSPATH)