diff --git a/build/Android.mk b/build/Android.mk
index 2864ea3df..7e5d180bc 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -64,3 +64,14 @@ $(android_jar_full_target): $(full_target)
 	$(hide)$(ACP) $< $@
 
 ALL_SDK_FILES += $(android_jar_full_target)
+
+
+android-support-v4_build_module := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android-support-v4_intermediates/javalib.jar
+android-support-v4_intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/android-support-v4_intermediates
+android-support-v4_full_target := $(android-support-v4_intermediates)/android-support-v4.jar
+$(android-support-v4_full_target): $(android-support-v4_build_module)
+	@echo Package android-support-v4.jar: $@
+	$(hide)mkdir -p $(dir $@)
+	$(hide)$(ACP) $< $@
+
+ALL_SDK_FILES += $(android-support-v4_full_target)
diff --git a/build/sdk.atree b/build/sdk.atree
index 4b6d016b9..1fb7dad52 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -145,7 +145,7 @@ frameworks/base/docs/docs-samples-redirect.html docs/samples/index.html
 
 # samples to include in the sdk samples package
 #
-# the list here should match the list of samples that we generate docs for, 
+# the list here should match the list of samples that we generate docs for,
 # (see web_docs_sample_code_flags in frameworks/base/Android.mk)
 development/apps/GestureBuilder              samples/${PLATFORM_NAME}/GestureBuilder
 development/samples/source.properties        samples/${PLATFORM_NAME}/source.properties
@@ -203,8 +203,8 @@ sdk/files/README_add-ons.txt add-ons/README.txt
 # Extra Component: Compatibility
 ##############################################################################
 
-development/sdk/compatibility_source.properties extras/android/compatibility/source.properties
-development/sdk/compatibility_README.txt        extras/android/compatibility/README.txt
-#${DIST_DIR}/android-support-v4.jar              extras/android/compatibility/v4/android-support-v4.jar
-frameworks/support/v4                           extras/android/compatibility/v4/src
-development/samples/ApiDemos                    extras/android/compatibility/v4/samples/ApiDemos
+development/sdk/compatibility_source.properties                                                   extras/android/compatibility/source.properties
+development/sdk/compatibility_README.txt                                                          extras/android/compatibility/README.txt
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-v4_intermediates/android-support-v4.jar    extras/android/compatibility/v4/android-support-v4.jar
+frameworks/support/v4                                                                             extras/android/compatibility/v4/src
+development/samples/ApiDemos                                                                      extras/android/compatibility/v4/samples/ApiDemos