diff options
| author | Ying Wang <wangying@google.com> | 2012-05-10 17:25:51 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-05-10 17:40:49 -0700 |
| commit | 0ec188f1c197709cf61d0de647b5220539b97322 (patch) | |
| tree | 03c6d5786e327b7a7c2e835d1c0221e8ee5309e8 /core/package.mk | |
| parent | 0c5db81fb28f74491e7f17c6c81ae0b19342ca7c (diff) | |
| download | build-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/package.mk')
| -rw-r--r-- | core/package.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/package.mk b/core/package.mk index def715f..195b346 100644 --- a/core/package.mk +++ b/core/package.mk @@ -267,7 +267,7 @@ else # Most packages should link against the resources defined by framework-res. # Even if they don't have their own resources, they may use framework # resources. -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))),) # for released sdk versions, the platform resources were built into android.jar. framework_res_package_export := \ $(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_RES_VERSION)/android.jar |