summaryrefslogtreecommitdiffstats
path: root/core/static_java_library.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-05-10 17:25:51 -0700
committerYing Wang <wangying@google.com>2012-05-10 17:40:49 -0700
commit0ec188f1c197709cf61d0de647b5220539b97322 (patch)
tree03c6d5786e327b7a7c2e835d1c0221e8ee5309e8 /core/static_java_library.mk
parent0c5db81fb28f74491e7f17c6c81ae0b19342ca7c (diff)
downloadbuild-0ec188f1c197709cf61d0de647b5220539b97322.zip
build-0ec188f1c197709cf61d0de647b5220539b97322.tar.gz
build-0ec188f1c197709cf61d0de647b5220539b97322.tar.bz2
Support to build against prebuilt current SDK in unbundled branch
Bug: 6465084 With this change and prebuilt current SDK checked in, you can build unbundled apps with LOCAL_SDK_VERSION current in an unbundled branch. Change-Id: I4efcee611d08a3a903bd6bf5a80de11500564206
Diffstat (limited to 'core/static_java_library.mk')
-rw-r--r--core/static_java_library.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index 9165050..367ea5f 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -64,7 +64,7 @@ framework_res_package_export :=
framework_res_package_export_deps :=
# Please refer to package.mk
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
-ifneq ($(filter-out current,$(LOCAL_SDK_RES_VERSION)),)
+ifneq ($(filter-out current,$(LOCAL_SDK_RES_VERSION))$(if $(TARGET_BUILD_APPS),$(filter current,$(LOCAL_SDK_RES_VERSION))),)
framework_res_package_export := \
$(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_RES_VERSION)/android.jar
framework_res_package_export_deps := $(framework_res_package_export)