StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 3fa11599 to eclair-mr2

Browse Source
This commit is contained in:
android-build SharedAccount
2009-10-28 16:12:11 -07:00
parent eae4fc960c 3fa115999c
commit 8a5d527223
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cleanspec.mk
View File

@@ -99,6 +99,10 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates)
$(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 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

4
core/version_defaults.mk
View File

@@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)"
# which is the version that we reveal to the end user. # which is the version that we reveal to the end user.
# Update this value when the platform version changes (rather # Update this value when the platform version changes (rather
# than overriding it somewhere else). Can be an arbitrary string. # than overriding it somewhere else). Can be an arbitrary string.
PLATFORM_VERSION := 2.0 PLATFORM_VERSION := 2.1
endif endif
ifeq "" "$(PLATFORM_SDK_VERSION)" ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -53,7 +53,7 @@ ifeq "" "$(PLATFORM_SDK_VERSION)"
# intermediate builds). During development, this number remains at the # intermediate builds). During development, this number remains at the
# SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds
# the code-name of the new development work. # the code-name of the new development work.
PLATFORM_SDK_VERSION := 5 PLATFORM_SDK_VERSION := 6
endif endif
ifeq "" "$(PLATFORM_VERSION_CODENAME)" ifeq "" "$(PLATFORM_VERSION_CODENAME)"