diff options
| author | Ying Wang <wangying@google.com> | 2010-09-28 16:25:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 16:25:15 -0700 |
| commit | c292927f05ff6955b1e5ffe40b8b9777328eba55 (patch) | |
| tree | c554ad1ba5aeae0bf02c437890ea4724c542a245 /core/base_rules.mk | |
| parent | 18c00c5c6abc9a3d781995ddd0225c7488f14ef4 (diff) | |
| parent | e1926260486707b3941b5488e97307f7904d1c99 (diff) | |
| download | build-c292927f05ff6955b1e5ffe40b8b9777328eba55.zip build-c292927f05ff6955b1e5ffe40b8b9777328eba55.tar.gz build-c292927f05ff6955b1e5ffe40b8b9777328eba55.tar.bz2 | |
am e1926260: Treat prebuilt SDKs and the stub as normal java libraries.
Merge commit 'e1926260486707b3941b5488e97307f7904d1c99' into gingerbread-plus-aosp
* commit 'e1926260486707b3941b5488e97307f7904d1c99':
Treat prebuilt SDKs and the stub as normal java libraries.
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 f9bf682..468a3ea 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) |