tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Silence superfluous build messages."

Browse source
This commit is contained in:
Tomasz Wasilczyk 2017-11-15 22:27:30 +00:00 committed by Gerrit Code Review
commit 4dbdb60698
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/Makefile
View file

@ -1222,15 +1222,15 @@ RECOVERYIMAGE_ID_FILE := $(PRODUCT_OUT)/recovery.id
# $(1): output file # $(1): output file
define build-recoveryimage-target define build-recoveryimage-target
@echo ----- Making recovery image ------ # Making recovery image
$(hide) mkdir -p $(TARGET_RECOVERY_OUT) $(hide) mkdir -p $(TARGET_RECOVERY_OUT)
$(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/sdcard $(TARGET_RECOVERY_ROOT_OUT)/tmp $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/sdcard $(TARGET_RECOVERY_ROOT_OUT)/tmp
@echo Copying baseline ramdisk... # Copying baseline ramdisk...
# Use rsync because "cp -Rf" fails to overwrite broken symlinks on Mac. # Use rsync because "cp -Rf" fails to overwrite broken symlinks on Mac.
$(hide) rsync -a --exclude=etc --exclude=sdcard $(IGNORE_RECOVERY_SEPOLICY) $(IGNORE_CACHE_LINK) $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) $(hide) rsync -a --exclude=etc --exclude=sdcard $(IGNORE_RECOVERY_SEPOLICY) $(IGNORE_CACHE_LINK) $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT)
# Copy adbd from system/bin to recovery/root/sbin # Copy adbd from system/bin to recovery/root/sbin
$(hide) cp -f $(TARGET_OUT_EXECUTABLES)/adbd $(TARGET_RECOVERY_ROOT_OUT)/sbin/adbd $(hide) cp -f $(TARGET_OUT_EXECUTABLES)/adbd $(TARGET_RECOVERY_ROOT_OUT)/sbin/adbd
@echo Modifying ramdisk contents... # Modifying ramdisk contents...
$(if $(BOARD_RECOVERY_KERNEL_MODULES), \ $(if $(BOARD_RECOVERY_KERNEL_MODULES), \
$(call build-image-kernel-modules,$(BOARD_RECOVERY_KERNEL_MODULES),$(TARGET_RECOVERY_ROOT_OUT),,$(call intermediates-dir-for,PACKAGING,depmod_recovery))) $(call build-image-kernel-modules,$(BOARD_RECOVERY_KERNEL_MODULES),$(TARGET_RECOVERY_ROOT_OUT),,$(call intermediates-dir-for,PACKAGING,depmod_recovery)))
# Removes $(TARGET_RECOVERY_ROOT_OUT)/init*.rc EXCEPT init.recovery*.rc. # Removes $(TARGET_RECOVERY_ROOT_OUT)/init*.rc EXCEPT init.recovery*.rc.
@ -1282,7 +1282,6 @@ define build-recoveryimage-target
$(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)), \ $(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)), \
$(hide) $(call assert-max-image-size,$(1),$(BOARD_BOOTIMAGE_PARTITION_SIZE)), \ $(hide) $(call assert-max-image-size,$(1),$(BOARD_BOOTIMAGE_PARTITION_SIZE)), \
$(hide) $(call assert-max-image-size,$(1),$(BOARD_RECOVERYIMAGE_PARTITION_SIZE))) $(hide) $(call assert-max-image-size,$(1),$(BOARD_RECOVERYIMAGE_PARTITION_SIZE)))
@echo ----- Made recovery image: $(1) --------
endef endef
ADBD := $(TARGET_OUT_EXECUTABLES)/adbd ADBD := $(TARGET_OUT_EXECUTABLES)/adbd

3
tools/generate-notice-files.py
View file

@ -253,15 +253,12 @@ def main(argv):
filesets = [sorted(files_with_same_hash[md5]) for md5 in sorted(files_with_same_hash.keys())] filesets = [sorted(files_with_same_hash[md5]) for md5 in sorted(files_with_same_hash.keys())]
print "Combining NOTICE files into text"
combine_notice_files_text(filesets, input_dir, txt_output_file, file_title) combine_notice_files_text(filesets, input_dir, txt_output_file, file_title)
if html_output_file is not None: if html_output_file is not None:
print "Combining NOTICE files into HTML"
combine_notice_files_html(filesets, input_dir, html_output_file) combine_notice_files_html(filesets, input_dir, html_output_file)
if xml_output_file is not None: if xml_output_file is not None:
print "Combining NOTICE files into XML"
combine_notice_files_xml(files_with_same_hash, input_dir, xml_output_file) combine_notice_files_xml(files_with_same_hash, input_dir, xml_output_file)
if __name__ == "__main__": if __name__ == "__main__":

11
tools/releasetools/build_image.py
View file

@ -195,8 +195,9 @@ def AdjustPartitionSizeForVerity(partition_size, fec_supported):
else: else:
hi = i hi = i
print("Adjusted partition size for verity, partition_size: {}," if OPTIONS.verbose:
" verity_size: {}".format(result, verity_size)) print("Adjusted partition size for verity, partition_size: {},"
" verity_size: {}".format(result, verity_size))
AdjustPartitionSizeForVerity.results[key] = (result, verity_size) AdjustPartitionSizeForVerity.results[key] = (result, verity_size)
return (result, verity_size) return (result, verity_size)
@ -257,7 +258,7 @@ def Append2Simg(sparse_image_path, unsparse_image_path, error_message):
return True return True
def Append(target, file_to_append, error_message): def Append(target, file_to_append, error_message):
print "appending %s to %s" % (file_to_append, target) # appending file_to_append to target
with open(target, "a") as out_file: with open(target, "a") as out_file:
with open(file_to_append, "r") as input_file: with open(file_to_append, "r") as input_file:
for line in input_file: for line in input_file:
@ -535,9 +536,9 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
try: try:
if fs_type.startswith("ext4"): if fs_type.startswith("ext4"):
(ext4fs_output, exit_code) = RunCommand(build_command, True) (ext4fs_output, exit_code) = RunCommand(build_command)
else: else:
(_, exit_code) = RunCommand(build_command, True) (_, exit_code) = RunCommand(build_command)
finally: finally:
if in_dir != origin_in: if in_dir != origin_in:
# Clean up temporary directories and files. # Clean up temporary directories and files.