aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-10-24 22:48:46 (GMT)
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-10-24 22:48:46 (GMT)
commit20a563a8edd3cfcec1396f337346bcd892025e8c (patch)
tree311a131591a4e0feecb99ef004515458845f73b8
parent316592f04f6f7b64c3074115b672b6f87cf40576 (diff)
parent177df04cdf652ef01fcd71e1835cdd3c713a0fcd (diff)
downloadandroid_build-cm-10.1.zip
android_build-cm-10.1.tar.gz
android_build-cm-10.1.tar.bz2
Merge tag 'cm-10.1.3' into cm-10.1cm-10.1
-rw-r--r--core/Makefile13
-rw-r--r--envsetup.sh5
-rwxr-xr-xtools/releasetools/sign_target_files_apks21
3 files changed, 23 insertions, 16 deletions
diff --git a/core/Makefile b/core/Makefile
index 635a800..9403f63 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -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 \
diff --git a/envsetup.sh b/envsetup.sh
index a1eb875..cd8315e 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -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
diff --git a/tools/releasetools/sign_target_files_apks b/tools/releasetools/sign_target_files_apks
index eaad8a4..6a968c1 100755
--- a/tools/releasetools/sign_target_files_apks
+++ b/tools/releasetools/sign_target_files_apks
@@ -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: