From d6a9ef63daf46dc5e3ae27a825583f2e878ba272 Mon Sep 17 00:00:00 2001
From: hmz007 <hmz007@gmail.com>
Date: Wed, 30 Mar 2022 13:14:36 +0800
Subject: [PATCH] rockchip: Minor fixes for generating version.h

Signed-off-by: hmz007 <hmz007@gmail.com>
---
 hardware/rockchip/libhwjpeg/Android.bp          |  1 -
 hardware/rockchip/libhwjpeg/genversion.sh       |  2 ++
 hardware/rockchip/libhwjpeg/src/version.h       |  6 +++---
 hardware/rockchip/libmpimmz/Android.bp          |  1 -
 hardware/rockchip/libmpimmz/version.sh          | 17 ++++++++++++-----
 .../hardware/interfaces/codec2/Android.bp       |  1 -
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/hardware/rockchip/libhwjpeg/Android.bp b/hardware/rockchip/libhwjpeg/Android.bp
index 152c97793f4..427cf89e9ae 100644
--- a/hardware/rockchip/libhwjpeg/Android.bp
+++ b/hardware/rockchip/libhwjpeg/Android.bp
@@ -3,7 +3,6 @@ genrule {
     srcs: [
         "version.h.template",
         "genversion.sh",
-        ".git/HEAD",
     ],
     cmd: "bash $(location genversion.sh) > $(out)",
     out: ["version.h"],
diff --git a/hardware/rockchip/libhwjpeg/genversion.sh b/hardware/rockchip/libhwjpeg/genversion.sh
index db3a69f7e86..bb6765c89a2 100755
--- a/hardware/rockchip/libhwjpeg/genversion.sh
+++ b/hardware/rockchip/libhwjpeg/genversion.sh
@@ -3,6 +3,8 @@
 cur_dir=`dirname $0`
 cd $cur_dir
 
+[ -d .git ] || exit 0
+
 # check for git short hash
 if ! test "$revision"; then
     revision=$(git describe --tags --match N 2> /dev/null)
diff --git a/hardware/rockchip/libhwjpeg/src/version.h b/hardware/rockchip/libhwjpeg/src/version.h
index bac79241372..a437cc25128 100644
--- a/hardware/rockchip/libhwjpeg/src/version.h
+++ b/hardware/rockchip/libhwjpeg/src/version.h
@@ -18,7 +18,7 @@
 #ifndef __VERSION_H__
 #define __VERSION_H__
 
-#define HWJPEG_VERSION_INFO     "git-2c9928c author: Chen Jinsen 2021-10-10 [project]: Update to support output version info"
-#define HWJPEG_BUILD_INFO       "built-Che 2021-10-10 12:09:56"
+#define HWJPEG_VERSION_INFO     "git-a3094bc author: Chen Jinsen 2022-03-04 [project] remove unused space blank"
+#define HWJPEG_BUILD_INFO       "built-FA 2022-03-29 20:07:21"
 
-#endif  // __VERSION_H__
\ No newline at end of file
+#endif  // __VERSION_H__
diff --git a/hardware/rockchip/libmpimmz/Android.bp b/hardware/rockchip/libmpimmz/Android.bp
index 64443972bc3..8f43aef4ddf 100644
--- a/hardware/rockchip/libmpimmz/Android.bp
+++ b/hardware/rockchip/libmpimmz/Android.bp
@@ -26,7 +26,6 @@ genrule {
     srcs: libmpimmz_src + [
         "version.sh",
         "version.h.template",
-        ".git/"
     ],
     out: ["version.h"],
     cmd: "bash $(location version.sh) < $(in) > $(out)",
diff --git a/hardware/rockchip/libmpimmz/version.sh b/hardware/rockchip/libmpimmz/version.sh
index 97c0f198193..872c959c499 100644
--- a/hardware/rockchip/libmpimmz/version.sh
+++ b/hardware/rockchip/libmpimmz/version.sh
@@ -1,14 +1,21 @@
 #!/bin/bash
 rm -f version.h
 
-COMMIT_INFO=$(cd $(dirname $0) && git log -1 --oneline --date=short --pretty=format:"%h date: %cd author: %<|(20)%an")
-BUILD_TIME=$(date "+%G-%m-%d %H:%M:%S")
-MPI_MMZ_VERSION="build:$BUILD_TIME   git-$COMMIT_INFO"
+CURRENTDIR=$(dirname $0)
+
+if [ -d $CURRENTDIR/.git ]; then
+	COMMIT_INFO=$(cd $CURRENTDIR && \
+		git log -1 --oneline --date=short --pretty=format:"%h date: %cd author: %<|(20)%an")
+else
+	COMMIT_INFO="e504f0e date: 2021-06-08 author: Meiyou Chen"
+fi
+
+MPI_MMZ_VERSION="git-$COMMIT_INFO"
 
 #Only when compiling with CMAKE in linux, will the current directory generate version.h.
 if [ $TARGET_PRODUCT ];then
-	cat $(dirname $0)/version.h.template | sed "s/\$FULL_VERSION/$MPI_MMZ_VERSION/g"
+	cat $CURRENTDIR/version.h.template | sed "s/\$FULL_VERSION/$MPI_MMZ_VERSION/g"
 else
-	cat $(dirname $0)/version.h.template | sed "s/\$FULL_VERSION/$MPI_MMZ_VERSION/g" > $(dirname $0)/version.h
+	cat $CURRENTDIR/version.h.template | sed "s/\$FULL_VERSION/$MPI_MMZ_VERSION/g" > $(dirname $0)/version.h
 	echo "Generated version.h"
 fi
diff --git a/vendor/rockchip/hardware/interfaces/codec2/Android.bp b/vendor/rockchip/hardware/interfaces/codec2/Android.bp
index a501ac07e98..d416d8c8c49 100644
--- a/vendor/rockchip/hardware/interfaces/codec2/Android.bp
+++ b/vendor/rockchip/hardware/interfaces/codec2/Android.bp
@@ -3,7 +3,6 @@ genrule {
     srcs: [
         "version.h.template",
         "version.sh",
-        ".git/HEAD",
     ],
     cmd: "bash $(location version.sh) > $(out)",
     out: ["C2RKVersion.h"],