Accept 4.6.x-google

Change-Id: I4eadea9498dcb5f55bd5cc025d2866b39b486cc3

1 files changed, 9 insertions, 0 deletions

diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk
index 124e915b72c9..0d3db775f10c 100644
--- a/solenv/bin/getcompver.awk
+++ b/solenv/bin/getcompver.awk
@@ -68,6 +68,15 @@ BEGIN {
         CCversion = substr($0, 0, index($0, "-") - 1)
     }
 }
+# NDK r8b has "4.6.x-google"
+/^[0-9]*[.][0-9]*[.][a-z]*-[0-9a-z]*$/ {
+    if ( compiler_matched == 0 ) {
+	# Include the second period in the match so that
+	# we will get a micro version of zero
+	x = match(  $0, /^[0-9]*[.][0-9]*[.]/ )
+        CCversion = substr($0, RSTART, RLENGTH)
+    }
+}
 END {
     if ( num == "true" ) {
         tokencount = split (CCversion,vertoken,".")