commit 3c0a7a6e04664174b13c060bb00fdf8c961fb42f
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 17 11:24:26 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 17 11:24:26 2018 -0700
tree d8b1f5d69c2353021909fe85ca029e601e014b06
parent 52efd7b82471806703658e09ab7139f341b15b0d
parent e7a2aa6ae8430ada41bde1a5b361233a69fc5a7c

Merge "target: init: Proper handling of target_get_vb_version"

target/init.c

diff --git a/target/init.c b/target/init.c
index 517793d..5ec4ab6 100644
--- a/target/init.c
+++ b/target/init.c
@@ -43,8 +43,8 @@
 #include <pm_fg_adc_usr.h>
 #endif
 
-#include <partition_parser.h>
 #if VERIFIED_BOOT || VERIFIED_BOOT_2
+#include <partition_parser.h>
 #include <ab_partition_parser.h>
 #endif
 
@@ -300,7 +300,7 @@
 	}
 	return ret;
 }
-
+#if VERIFIED_BOOT || VERIFIED_BOOT_2
 int target_get_vb_version()
 {
 	if (vb_version == INVALID)
@@ -315,6 +315,12 @@
 	}
 	return vb_version;
 }
+#else
+int target_get_vb_version()
+{
+	return vb_version;
+}
+#endif
 
 #if VERIFIED_BOOT_LE
 int verified_boot_le = 1;