build.sh: process KMI_WHITELIST independent of ABI_DEFINITION

Otherwise this breaks configurations that set a KMI_WHITELIST without
and ABI_DEFINITION (as does build_abi.sh).

Fixes: d96f85df16ec ("build.sh: write abi.prop to contain ABI related properties")
Change-Id: I822698748ecba770082eef04ad9d5e4b0c41f1d4
Signed-off-by: Matthias Maennich <maennich@google.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/build.sh b/build.sh
index 2d46dede..fa9d3b03 100755
--- a/build.sh
+++ b/build.sh
@@ -303,26 +303,27 @@ if [ -n "${TAGS_CONFIG}" ]; then
   exit 0
 fi
 
+# Truncate abi.prop file
+ABI_PROP=${DIST_DIR}/abi.prop
+: > ${ABI_PROP}
+
 if [ -n "${ABI_DEFINITION}" ]; then
 
-  ABI_PROP=${DIST_DIR}/abi.prop
   ABI_XML=${DIST_DIR}/abi.xml
 
-  : > ${ABI_PROP}
-
   echo "KMI_DEFINITION=abi.xml" >> ${ABI_PROP}
   echo "KMI_MONITORED=1"        >> ${ABI_PROP}
 
-  if [ -n "${KMI_WHITELIST}" ]; then
-    ABI_WL=${DIST_DIR}/abi_whitelist
-    echo "KMI_WHITELIST=abi_whitelist" >> ${ABI_PROP}
-  fi
-
   if [ -n "${KMI_ENFORCED}" ]; then
     echo "KMI_ENFORCED=1" >> ${ABI_PROP}
   fi
 fi
 
+if [ -n "${KMI_WHITELIST}" ]; then
+  ABI_WL=${DIST_DIR}/abi_whitelist
+  echo "KMI_WHITELIST=abi_whitelist" >> ${ABI_PROP}
+fi
+
 # Copy the abi_${arch}.xml file from the sources into the dist dir
 if [ -n "${ABI_DEFINITION}" ]; then
   echo "========================================================"