qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: add brackets to fix compile error 

There is a compile error when enable AB config. The error message is
"error: a label can only be part of a statement and a declaration isnot
a statement". Add brackets to fix this error.

Change-Id: I4ec3af984503e35fc1304d08cd7cd8ab587dfb0a
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
This commit is contained in:
Jason Zhu 2019-02-28 21:53:57 +08:00 committed by Jianhong Chen
parent 332992a7f2
commit d2280c00f2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/android_bootloader.c
View File

@ -969,7 +969,8 @@ int android_bootloader_boot_flow(struct blk_desc *dev_desc,
* "skip_initramfs" to the cmdline to make it ignore the
* recovery initramfs in the boot partition.
*/
#if defined(CONFIG_ANDROID_AB) && !defined(CONFIG_ANDROID_AVB)
#if (defined(CONFIG_ANDROID_AB) && !defined(CONFIG_ANDROID_AVB))
{
char root_partition[20] = {0};
char guid_buf[UUID_SIZE] = {0};
char root_partuuid[70] = "root=PARTUUID=";
@ -979,6 +980,7 @@ int android_bootloader_boot_flow(struct blk_desc *dev_desc,
get_partition_unique_uuid(root_partition, guid_buf, UUID_SIZE);
strcat(root_partuuid, guid_buf);
env_update("bootargs", root_partuuid);
}
#endif
#ifdef CONFIG_ANDROID_AB