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

Commit 20a563a8 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'cm-10.1.3' into cm-10.1

parents 316592f0 177df04c

core/Makefile

+7 −6
Original line number Diff line number Diff line
@@ -182,12 +182,6 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( 
			PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \

			PRIVATE_BUILD_DESC="$(PRIVATE_BUILD_DESC)" \

			BUILD_ID="$(BUILD_ID)" \

			BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \

			BUILD_NUMBER="$(BUILD_NUMBER)" \

			PLATFORM_VERSION="$(PLATFORM_VERSION)" \

			PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \

			PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \

			BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \

			TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \

			BUILD_FINGERPRINT="$(BUILD_FINGERPRINT)" \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \
@@ -195,6 +189,12 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( 
			TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \

			TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \

			$(PRODUCT_BUILD_PROP_OVERRIDES) \

			BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \

			BUILD_NUMBER="$(BUILD_NUMBER)" \

			PLATFORM_VERSION="$(PLATFORM_VERSION)" \

			PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \

			PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \

			BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \

	        bash $(BUILDINFO_SH) > $@

	$(hide) if [ -f $(TARGET_DEVICE_DIR)/system.prop ]; then \

	          cat $(TARGET_DEVICE_DIR)/system.prop >> $@; \
@@ -1332,6 +1332,7 @@ else 
endif



$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)

	@echo "$(OTA_FROM_TARGET_SCRIPT)" > $(PRODUCT_OUT)/ota_script_path

	@echo -e ${CL_YLW}"Package OTA:"${CL_RST}" $@"

	MKBOOTIMG=$(BOARD_CUSTOM_BOOTIMG_MK) \

	$(OTA_FROM_TARGET_SCRIPT) -v \

envsetup.sh

+5 −0
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ function check_product() 


    if (echo -n $1 | grep -q -e "^cm_") ; then

       CM_BUILD=$(echo -n $1 | sed -e 's/^cm_//g')

       if [ `uname` == "Darwin" ]; then

           export BUILD_NUMBER=$((date +%s%N ; echo $CM_BUILD; hostname) | openssl sha1 | cut -c1-10)

       else

           export BUILD_NUMBER=$((date +%s%N ; echo $CM_BUILD; hostname) | sha1sum | cut -c1-10)

       fi

    else

       CM_BUILD=

    fi

tools/releasetools/sign_target_files_apks

+11 −10
Original line number Diff line number Diff line
@@ -185,16 +185,17 @@ def RewriteProps(data): 
    original_line = line

    if line and line[0] != '#':

      key, value = line.split("=", 1)

      if key == "ro.build.fingerprint":

        pieces = value.split("/")

        pieces[-1] = EditTags(pieces[-1])

        value = "/".join(pieces)

      elif key == "ro.build.description":

        pieces = value.split(" ")

        assert len(pieces) == 5

        pieces[-1] = EditTags(pieces[-1])

        value = " ".join(pieces)

      elif key == "ro.build.tags":

      #if key == "ro.build.fingerprint":

      #  pieces = value.split("/")

      #  pieces[-1] = EditTags(pieces[-1])

      #  value = "/".join(pieces)

      #elif key == "ro.build.description":

      #  pieces = value.split(" ")

      #  assert len(pieces) == 5

      #  pieces[-1] = EditTags(pieces[-1])

      #  value = " ".join(pieces)

      #elif key == "ro.build.tags":

      if key == "ro.build.tags":

        value = EditTags(value)

      line = key + "=" + value

    if line != original_line: