Fix Unified code
diff --git a/core/Makefile b/core/Makefile
index c98d23e..c401f4e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -204,6 +204,12 @@
TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \
TARGET_UNIFIED_DEVICE="$(TARGET_UNIFIED_DEVICE)" \
$(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) $(foreach file,$(system_prop_file), \
if [ -f "$(file)" ]; then \
@@ -1309,16 +1315,35 @@
$(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
-ifneq ($(TARGET_UNIFIED_DEVICE),)
- $(INTERNAL_OTA_PACKAGE_TARGET): override_prop := --override_prop=true
+ifeq ($(TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT),)
+ OTA_FROM_TARGET_SCRIPT := ./build/tools/releasetools/ota_from_target_files
+else
+ OTA_FROM_TARGET_SCRIPT := $(TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT)
+endif
+
+ifeq ($(TARGET_OTA_ASSERT_DEVICE),)
+ $(INTERNAL_OTA_PACKAGE_TARGET): override_device := auto
+else
+ $(INTERNAL_OTA_PACKAGE_TARGET): override_device := $(TARGET_OTA_ASSERT_DEVICE)
+endif
+
+ifeq ($(TARGET_UNIFIED_DEVICE),)
+ $(INTERNAL_OTA_PACKAGE_TARGET): override_prop := false
+else
+ $(INTERNAL_OTA_PACKAGE_TARGET): override_prop := true
endif
$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)
+ @echo "$(OTA_FROM_TARGET_SCRIPT)" > $(PRODUCT_OUT)/ota_script_path
+ @echo "$(override_device)" > $(PRODUCT_OUT)/ota_override_device
@echo -e ${CL_YLW}"Package OTA:"${CL_RST}" $@"
- $(hide) ./build/tools/releasetools/ota_from_target_files -v \
+ MKBOOTIMG=$(BOARD_CUSTOM_BOOTIMG_MK) \
+ $(OTA_FROM_TARGET_SCRIPT) -v \
-p $(HOST_OUT) \
-k $(KEY_CERT_PAIR) \
- --override_device=$(override_device) $(override_prop) \
+ --backup=$(backuptool) \
+ --override_device=$(override_device) \
+ --override_prop=$(override_prop) \
$(BUILT_TARGET_FILES_PACKAGE) $@
.PHONY: otapackage
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
index a5a2b9d..593a6c9 100644
--- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh
@@ -15,10 +15,8 @@
echo "ro.build.user=$USER"
echo "ro.build.host=`hostname`"
echo "ro.build.tags=$BUILD_VERSION_TAGS"
-#echo "ro.product.model=$PRODUCT_MODEL"
echo "ro.product.brand=$PRODUCT_BRAND"
echo "ro.product.name=$PRODUCT_NAME"
-#echo "ro.product.device=$TARGET_DEVICE"
echo "ro.product.board=$TARGET_BOOTLOADER_BOARD_NAME"
echo "ro.product.cpu.abi=$TARGET_CPU_ABI"
if [ -n "$TARGET_CPU_ABI2" ] ; then
@@ -36,11 +34,9 @@
echo "# ro.build.product is obsolete; use ro.product.device"
echo "ro.build.product=$TARGET_DEVICE"
-#echo "# Do not try to parse ro.build.description or .fingerprint"
-#echo "ro.build.description=$PRIVATE_BUILD_DESC"
-#echo "ro.build.fingerprint=$BUILD_FINGERPRINT"
+
if [ "$TARGET_UNIFIED_DEVICE" == "" ] ; then
-echo "ro.product.model=$PRODUCT_MODEL"
+ echo "ro.product.model=$PRODUCT_MODEL"
echo "ro.product.device=$TARGET_DEVICE"
echo "# Do not try to parse ro.build.description or .fingerprint"
echo "ro.build.description=$PRIVATE_BUILD_DESC"
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
old mode 100644
new mode 100755
diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py
old mode 100644
new mode 100755
diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files
old mode 100644
new mode 100755
index a5d4cfa..6528f17
--- a/tools/releasetools/ota_from_target_files
+++ b/tools/releasetools/ota_from_target_files
@@ -549,11 +549,17 @@
script = edify_generator.EdifyGenerator(source_version,
OPTIONS.target_info_dict)
- metadata = {"pre-device": GetBuildProp("ro.product.device",
- OPTIONS.source_info_dict),
- "post-timestamp": GetBuildProp("ro.build.date.utc",
- OPTIONS.target_info_dict),
- }
+
+ if OPTIONS.override_prop:
+ metadata = {"post-timestamp": GetBuildProp("ro.build.date.utc",
+ OPTIONS.target_info_dict),
+ }
+ else:
+ metadata = {"pre-device": GetBuildProp("ro.product.device",
+ OPTIONS.source_info_dict),
+ "post-timestamp": GetBuildProp("ro.build.date.utc",
+ OPTIONS.target_info_dict),
+ }
device_specific = common.DeviceSpecificParams(
source_zip=source_zip,
@@ -879,7 +885,7 @@
"aslr_mode=",
"backup=",
"override_device=",
- "override_prop="],
+ "override_prop="],
extra_option_handler=option_handler)
if len(args) != 2: