am 288d90c2: Merge "The "current" SDK stubs jar should use the full apk that\'s exported, not the product-specific one." into gingerbread

Merge commit '288d90c212b534e85ccf12d7bc1b5bd1d0562c5b' into gingerbread-plus-aosp

* commit '288d90c212b534e85ccf12d7bc1b5bd1d0562c5b':
  The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one.
This commit is contained in:
Joe Onorato
2010-07-15 11:12:37 -07:00
committed by Android Git Automerger

View File

@@ -15,7 +15,7 @@ intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_stubs
full_target := $(intermediates)/classes.jar
src_dir := $(intermediates)/src
classes_dir := $(intermediates)/classes
framework_res_package := $(call intermediates-dir-for,APPS,framework-res)/package.apk
framework_res_package := $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk
$(full_target): PRIVATE_SRC_DIR := $(src_dir)
$(full_target): PRIVATE_INTERMEDIATES_DIR := $(intermediates)