Merge "fastboot: set device lock default [2/4]" into p-amlogic

4 files changed, 26 insertions, 22 deletions

diff --git a/factory.mk b/factory.mk
index 85687bc..83494d9 100644
--- a/factory.mk
+++ b/factory.mk
@@ -21,6 +21,11 @@ endif
 BUILT_IMAGES += vendor.img
 ifeq ($(BOARD_USES_ODMIMAGE),true)
 BUILT_IMAGES += odm.img
+# Adds the image and the matching map file to <product>-target_files-<build number>.zip, to allow
+# generating OTA from target_files.zip (b/111128214).
+INSTALLED_RADIOIMAGE_TARGET += $(PRODUCT_OUT)/odm.img $(PRODUCT_OUT)/odm.map
+# Adds to <product name>-img-<build number>.zip so can be flashed.  b/110831381
+BOARD_PACK_RADIOIMAGES += odm.img odm.map
 endif
 
 ifeq ($(BOARD_USES_PRODUCTIMAGE),true)
@@ -68,6 +73,9 @@ $(INSTALLED_ODMIMAGE_TARGET) : $(INTERNAL_ODMIMAGE_FILES) $(PRODUCT_OUT)/system.
 	-cp $(PRODUCT_OUT)/odm.map $(AML_TARGET)/IMAGES/
 	-cp $(PRODUCT_OUT)/odm.img $(AML_TARGET)/IMAGES/
 
+# We need a (implicit) rule for odm.map, in order to support the INSTALLED_RADIOIMAGE_TARGET above.
+$(INSTALLED_ODMIMAGE_TARGET): .KATI_IMPLICIT_OUTPUTS := $(PRODUCT_OUT)/odm.map
+
 .PHONY: odm_image
 odm_image : $(INSTALLED_ODMIMAGE_TARGET)
 $(call dist-for-goals, odm_image, $(INSTALLED_ODMIMAGE_TARGET))
@@ -137,6 +145,9 @@ dtbimage: $(INSTALLED_BOARDDTB_TARGET)
 
 endif # ifdef KERNEL_DEVICETREE
 
+# Adds to <product name>-img-<build number>.zip so can be flashed.  b/110831381
+INSTALLED_RADIOIMAGE_TARGET += $(PRODUCT_OUT)/dt.img
+BOARD_PACK_RADIOIMAGES += dt.img
 
 UPGRADE_FILES := \
         aml_sdc_burn.ini \
@@ -182,6 +193,10 @@ $(INSTALLED_AML_LOGO): $(IMGPACK) $(wildcard $(TARGET_AMLOGIC_RES_PACKAGE)/*)
 	@cp -rf $(TARGET_AMLOGIC_RES_PACKAGE)/* $(PRODUCT_UPGRADE_OUT)/logo
 	$(hide) $(IMGPACK) -r $(PRODUCT_UPGRADE_OUT)/logo $@
 	@echo "Installed $@"
+# Adds to <product name>-img-<build number>.zip so can be flashed.  b/110831381
+INSTALLED_RADIOIMAGE_TARGET += $(PRODUCT_UPGRADE_OUT)/logo.img
+BOARD_PACK_RADIOIMAGES += logo.img
+
 else
 INSTALLED_AML_LOGO :=
 endif
@@ -243,6 +258,8 @@ $(INSTALLED_AMLOGIC_BOOTLOADER_TARGET) : $(TARGET_DEVICE_DIR)/bootloader.img
 	$(hide) $(call aml-secureboot-sign-bootloader, $@)
 	@echo "make $@: bootloader installed end"
 
+$(call dist-for-goals, droidcore, $(PRODUCT_OUT)/bootloader.img)
+
 ifeq ($(TARGET_SUPPORT_USB_BURNING_V2),true)
 INSTALLED_AML_UPGRADE_PACKAGE_TARGET := $(PRODUCT_OUT)/aml_upgrade_package.img
 $(warning will keep $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET))
diff --git a/flash-all.bat b/flash-all.bat
index 1175074..dbbeaf5 100755
--- a/flash-all.bat
+++ b/flash-all.bat
@@ -23,6 +23,8 @@ fastboot flash bootloader-boot1 bootloader.img
 fastboot erase env
 fastboot reboot-bootloader
 ping -n 5 127.0.0.1 >nul
+fastboot flashing unlock_critical
+fastboot flashing unlock
 fastboot flash dts dt.img
 fastboot -w
 fastboot flash vbmeta vbmeta.img
@@ -33,6 +35,8 @@ fastboot flash system system.img
 fastboot flash vendor vendor.img
 fastboot flash recovery recovery.img
 fastboot flash product product.img
+fastboot flashing lock_critical
+fastboot flashing lock
 fastboot reboot
 
 echo Press any key to exit...
diff --git a/flash-all.sh b/flash-all.sh
index 2fbea28..ab5bd1f 100755
--- a/flash-all.sh
+++ b/flash-all.sh
@@ -23,6 +23,8 @@ fastboot flash bootloader-boot1 bootloader.img
 fastboot erase env
 fastboot reboot-bootloader
 sleep 5
+fastboot flashing unlock_critical
+fastboot flashing unlock
 fastboot flash dts dt.img
 fastboot -w
 fastboot flash vbmeta vbmeta.img
@@ -33,4 +35,6 @@ fastboot flash system system.img
 fastboot flash vendor vendor.img
 fastboot flash recovery recovery.img
 fastboot flash product product.img
+fastboot flashing lock_critical
+fastboot flashing lock
 fastboot reboot
diff --git a/releasetools.py b/releasetools.py
index b3f9364..e71996c 100755
--- a/releasetools.py
+++ b/releasetools.py
@@ -201,28 +201,7 @@ def FullOTA_InstallBegin(info):
 
 def FullOTA_InstallEnd(info):
   print "amlogic extensions:FullOTA_InstallEnd"
-
-  print("******has odm partition*********")
-
-  dest_file = os.path.join(OPTIONS.input_tmp, "IMAGES","odm.img")
-  src_file = os.path.join(OPTIONS.input_tmp, "../../../../","odm.img")
-  mycopyfile(src_file, dest_file);
-
-  dest_file2 = os.path.join(OPTIONS.input_tmp, "IMAGES","odm.map")
-  src_file2 = os.path.join(OPTIONS.input_tmp, "../../../../","odm.map")
-  mycopyfile(src_file2, dest_file2);
-
-  dest_file3 = os.path.join(OPTIONS.input_tmp, "IMAGES","dt.img")
-  src_file3 = os.path.join(OPTIONS.input_tmp, "../../../../","dt.img")
-  mycopyfile(src_file3, dest_file3);
-
-  dest_file4 = os.path.join(OPTIONS.input_tmp, "IMAGES","logo.img")
-  src_file4 = os.path.join(OPTIONS.input_tmp, "../../../../upgrade/","logo.img")
-  mycopyfile(src_file4, dest_file4);
-
-  #dest_file5 = os.path.join(OPTIONS.input_tmp, "IMAGES","bootloader.img")
-  #src_file5 = os.path.join(OPTIONS.input_tmp, "../../../../","u-boot.bin")
-  #mycopyfile(src_file5, dest_file5);
+  print "******has odm partition********* %s" % (OPTIONS.input_tmp)
 
   odm_tgt = GetImage("odm", OPTIONS.input_tmp)
   odm_tgt.ResetFileMap()