am e4ccbd68: Use a function to package android support libraries.

* commit 'e4ccbd68ec540739819bea7e109d29d08a54122a':
  Use a function to package android support libraries.
This commit is contained in:
Ying Wang
2011-06-07 13:59:27 -07:00
committed by Android Git Automerger

View File

@@ -66,22 +66,20 @@ $(android_jar_full_target): $(full_target)
ALL_SDK_FILES += $(android_jar_full_target) ALL_SDK_FILES += $(android_jar_full_target)
android-support-v4_build_module := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android-support-v4_intermediates/javalib.jar # $(1): the Java library name
android-support-v4_intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/android-support-v4_intermediates define _package_sdk_library
android-support-v4_full_target := $(android-support-v4_intermediates)/android-support-v4.jar $(eval _psm_build_module := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(1)_intermediates/javalib.jar)
$(android-support-v4_full_target): $(android-support-v4_build_module) $(eval _psm_packaging_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(1)_intermediates/$(1).jar)
@echo Package android-support-v4.jar: $@ $(_psm_packaging_target) : $(_psm_build_module) | $(ACP)
$(hide)mkdir -p $(dir $@) @echo "Package $(1).jar: $$@"
$(hide)$(ACP) $< $@ $(hide) mkdir -p $$(dir $$@)
$(hide) $(ACP) $$< $$@
ALL_SDK_FILES += $(android-support-v4_full_target) ALL_SDK_FILES += $(_psm_packaging_target)
$(eval _psm_build_module :=)
$(eval _psm_packaging_target :=)
endef
android-support-v13_build_module := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android-support-v13_intermediates/javalib.jar ANDROID_SUPPORT_LIBRARIES := android-support-v4 android-support-v13
android-support-v13_intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/android-support-v13_intermediates
android-support-v13_full_target := $(android-support-v13_intermediates)/android-support-v13.jar
$(android-support-v13_full_target): $(android-support-v13_build_module)
@echo Package android-support-v13.jar: $@
$(hide)mkdir -p $(dir $@)
$(hide)$(ACP) $< $@
ALL_SDK_FILES += $(android-support-v13_full_target) $(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,$(lib))))