diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-11-19 10:57:12 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2009-11-19 10:57:12 -0800 |
| commit | 07e1232a2dc2887ba0003d629032c21fbb426652 (patch) | |
| tree | 88abf5a75a35cf3357cd5173968cc976b3991298 | |
| parent | 1f816cf57b93654638989e6007d669c04b3d9b88 (diff) | |
| parent | 90b35770c227f9b4ad56194de627593496acf724 (diff) | |
| download | build-07e1232a2dc2887ba0003d629032c21fbb426652.zip build-07e1232a2dc2887ba0003d629032c21fbb426652.tar.gz build-07e1232a2dc2887ba0003d629032c21fbb426652.tar.bz2 | |
resolved conflicts for merge of 90b35770 to eclair-mr2
| -rw-r--r-- | cleanspec.mk | 4 | ||||
| -rw-r--r-- | core/version_defaults.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cleanspec.mk b/cleanspec.mk index 8ad575c..414fb84 100644 --- a/cleanspec.mk +++ b/cleanspec.mk @@ -113,6 +113,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_int $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libjs_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libv8_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/os/IDropBoxService.java) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 913c6cd..33d7761 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 2.0.1 + PLATFORM_VERSION := 2.1 endif ifeq "" "$(PLATFORM_SDK_VERSION)" @@ -53,7 +53,7 @@ ifeq "" "$(PLATFORM_SDK_VERSION)" # intermediate builds). During development, this number remains at the # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds # the code-name of the new development work. - PLATFORM_SDK_VERSION := 6 + PLATFORM_SDK_VERSION := 7 endif ifeq "" "$(PLATFORM_VERSION_CODENAME)" |