diff options
| author | Ying Wang <wangying@google.com> | 2010-09-28 16:18:03 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-09-28 16:18:03 -0700 |
| commit | e1926260486707b3941b5488e97307f7904d1c99 (patch) | |
| tree | a35ae966125738e89119f44bfcc7118528fd6907 /core/base_rules.mk | |
| parent | bb2b82bd557b157fea5e280ef50ee782d15ac032 (diff) | |
| download | build-e1926260486707b3941b5488e97307f7904d1c99.zip build-e1926260486707b3941b5488e97307f7904d1c99.tar.gz build-e1926260486707b3941b5488e97307f7904d1c99.tar.bz2 | |
Treat prebuilt SDKs and the stub as normal java libraries.
Change-Id: Ic5512b952d8218e63e40aeb07966de21391ef42d
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 12 |
1 files changed, 0 insertions, 12 deletions
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_libs := $(addprefix $(HOST_OUT_JAVA_LIBRARIES)/,$(addsuffix $(COMMON_J 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) |