diff options
| author | Ying Wang <wangying@google.com> | 2011-04-08 17:27:35 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-04-08 17:27:35 -0700 |
| commit | bb9c230b68e9b57fe60f050e231f8437324f107a (patch) | |
| tree | b6cd06fb47ab3e49ea2e365b4430cf62afd09fb7 /core/package.mk | |
| parent | a56cf6adf0b4b6d5a7a9386c3af2c85b77b73feb (diff) | |
| download | build-bb9c230b68e9b57fe60f050e231f8437324f107a.zip build-bb9c230b68e9b57fe60f050e231f8437324f107a.tar.gz build-bb9c230b68e9b57fe60f050e231f8437324f107a.tar.bz2 | |
Set the default app sdk verstion to LOCAL_SDK_VERSION
Instead of using the DEFAULT_APP_TARGET_SDK, which is the hardcoded in
the build system, ie the sdk version of the current source tree.
Change-Id: I2fae3521300cc6b2449df3659ded7f7a397609c0
Diffstat (limited to 'core/package.mk')
| -rw-r--r-- | core/package.mk | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/core/package.mk b/core/package.mk index 87c5ae9..adc542b 100644 --- a/core/package.mk +++ b/core/package.mk @@ -163,7 +163,14 @@ include $(BUILD_SYSTEM)/java.mk full_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE) $(LOCAL_INTERMEDIATE_TARGETS): \ - PRIVATE_ANDROID_MANIFEST := $(full_android_manifest) + PRIVATE_ANDROID_MANIFEST := $(full_android_manifest) +ifneq (,$(filter-out current, $(LOCAL_SDK_VERSION))) +$(LOCAL_INTERMEDIATE_TARGETS): \ + PRIVATE_DEFAULT_APP_TARGET_SDK := $(LOCAL_SDK_VERSION) +else +$(LOCAL_INTERMEDIATE_TARGETS): \ + PRIVATE_DEFAULT_APP_TARGET_SDK := $(DEFAULT_APP_TARGET_SDK) +endif ifneq ($(all_resources),) @@ -233,7 +240,7 @@ ifneq ($(full_classes_jar),) $(full_classes_compiled_jar): $(R_file_stamp) endif -endif # all_resources +endif # all_resources ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true) # We need to explicitly clear this var so that we don't @@ -246,20 +253,20 @@ else ifneq ($(filter-out current,$(LOCAL_SDK_VERSION)),) # for released sdk versions, the platform resources were built into android.jar. framework_res_package_export := \ - $(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_VERSION)/android.jar + $(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_VERSION)/android.jar framework_res_package_export_deps := $(framework_res_package_export) else # LOCAL_SDK_VERSION framework_res_package_export := \ - $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk + $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk # We can't depend directly on the export.apk file; it won't get its # PRIVATE_ vars set up correctly if we do. Instead, depend on the # corresponding R.stamp file, which lists the export.apk as a dependency. framework_res_package_export_deps := \ - $(dir $(framework_res_package_export))src/R.stamp + $(dir $(framework_res_package_export))src/R.stamp endif # LOCAL_SDK_VERSION $(R_file_stamp): $(framework_res_package_export_deps) $(LOCAL_INTERMEDIATE_TARGETS): \ - PRIVATE_AAPT_INCLUDES := $(framework_res_package_export) + PRIVATE_AAPT_INCLUDES := $(framework_res_package_export) endif # LOCAL_NO_STANDARD_LIBRARIES ifneq ($(full_classes_jar),) |