Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 227b9f8b authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Dev branch for ICS MR2."

parents 9b856464 6e4e1bbb

CleanSpec.mk

+6 −0
Original line number Diff line number Diff line
@@ -108,6 +108,12 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libbcinfo_intermediates)



# ICS MR2!!!!!!!!!!!!

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libbcinfo_intermediates)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/version_defaults.mk

+2 −2
Original line number Diff line number Diff line
@@ -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 := 4.1

  PLATFORM_VERSION := IceCreamSandwichMR2

endif



ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -59,7 +59,7 @@ endif 
ifeq "" "$(PLATFORM_VERSION_CODENAME)"

  # This is the current development code-name, if the build is not a final

  # release build.  If this is a final release build, it is simply "REL".

  PLATFORM_VERSION_CODENAME := REL

  PLATFORM_VERSION_CODENAME := IceCreamSandwichMR2

endif



ifeq "" "$(DEFAULT_APP_TARGET_SDK)"

envsetup.sh

+1 −1
Original line number Diff line number Diff line
@@ -916,7 +916,7 @@ function runhat() 
    echo "Running hat on $localFile"

    echo "View the output by pointing your browser at http://localhost:7000/"

    echo ""

    hat $localFile

    hat -JXmx512m $localFile

}



function getbugreports()