diff options
| author | Ying Wang <wangying@google.com> | 2014-07-19 17:00:50 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-07-19 17:00:50 -0700 |
| commit | efb935800bce97abe0938270ba4c9cd3af6fb7b9 (patch) | |
| tree | fbce59b895518f4815a7c17e28d4e382fc268c48 /core/static_java_library.mk | |
| parent | 50367cc77db4f576f6e7421e6b302395d202482e (diff) | |
| download | build-efb935800bce97abe0938270ba4c9cd3af6fb7b9.zip build-efb935800bce97abe0938270ba4c9cd3af6fb7b9.tar.gz build-efb935800bce97abe0938270ba4c9cd3af6fb7b9.tar.bz2 | |
Support "LOCAL_SDK_VERSION := system_current"
A module can declare "LOCAL_SDK_VERSION := system_current" to build
against the android system stubs generated from source.
For now this is only supported in platform build.
Change-Id: I1e9bbd159886bc0ea3a02b1dc4cbcb1a56e9cb15
Diffstat (limited to 'core/static_java_library.mk')
| -rw-r--r-- | core/static_java_library.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/static_java_library.mk b/core/static_java_library.mk index 8e6029d..02078e0 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -78,7 +78,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))$(if $(TARGET_BUILD_APPS),$(filter current,$(LOCAL_SDK_RES_VERSION))),) +ifneq ($(filter-out current system_current,$(LOCAL_SDK_RES_VERSION))$(if $(TARGET_BUILD_APPS),$(filter current system_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) @@ -98,7 +98,7 @@ $(R_file_stamp): PRIVATE_ANDROID_MANIFEST := $(full_android_manifest) $(R_file_stamp): PRIVATE_RESOURCE_PUBLICS_OUTPUT := $(intermediates.COMMON)/public_resources.xml $(R_file_stamp): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR) $(R_file_stamp): PRIVATE_AAPT_INCLUDES := $(framework_res_package_export) -ifneq (,$(filter-out current, $(LOCAL_SDK_VERSION))) +ifneq (,$(filter-out current system_current, $(LOCAL_SDK_VERSION))) $(R_file_stamp): PRIVATE_DEFAULT_APP_TARGET_SDK := $(LOCAL_SDK_VERSION) else $(R_file_stamp): PRIVATE_DEFAULT_APP_TARGET_SDK := $(DEFAULT_APP_TARGET_SDK) |