Do not include config/aom_version.h

Replace the VERSION_STRING_NOSP macro by the public API function
aom_codec_version_str().

Treat config/aom_version.h as an absolutely internal header of the
libaom library.

Change-Id: Ic26635c11a84c88debac69ca564c9a7cd4294f53

test/decode_perf_test.cc

diff --git a/test/decode_perf_test.cc b/test/decode_perf_test.cc
index ab80dbc..14b0f9e 100644
--- a/test/decode_perf_test.cc
+++ b/test/decode_perf_test.cc
@@ -12,8 +12,7 @@
 #include <string>
 #include <tuple>
 
-#include "config/aom_version.h"
-
+#include "aom/aom_codec.h"
 #include "aom_ports/aom_timer.h"
 #include "common/ivfenc.h"
 #include "test/codec_factory.h"
@@ -82,7 +81,7 @@
 
   printf("{\n");
   printf("\t\"type\" : \"decode_perf_test\",\n");
-  printf("\t\"version\" : \"%s\",\n", VERSION_STRING_NOSP);
+  printf("\t\"version\" : \"%s\",\n", aom_codec_version_str());
   printf("\t\"videoName\" : \"%s\",\n", video_name);
   printf("\t\"threadCount\" : %u,\n", threads);
   printf("\t\"decodeTimeSecs\" : %f,\n", elapsed_secs);
@@ -232,7 +231,7 @@
 
   printf("{\n");
   printf("\t\"type\" : \"decode_perf_test\",\n");
-  printf("\t\"version\" : \"%s\",\n", VERSION_STRING_NOSP);
+  printf("\t\"version\" : \"%s\",\n", aom_codec_version_str());
   printf("\t\"videoName\" : \"%s\",\n", kNewEncodeOutputFile);
   printf("\t\"threadCount\" : %u,\n", threads);
   printf("\t\"decodeTimeSecs\" : %f,\n", elapsed_secs);

test/encode_perf_test.cc

diff --git a/test/encode_perf_test.cc b/test/encode_perf_test.cc
index 9ee7ab0..ba78a98 100644
--- a/test/encode_perf_test.cc
+++ b/test/encode_perf_test.cc
@@ -12,15 +12,13 @@
 #include <string>
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 
-#include "config/aom_config.h"
-#include "config/aom_version.h"
-
+#include "aom/aom_codec.h"
+#include "aom_ports/aom_timer.h"
 #include "test/codec_factory.h"
 #include "test/encode_test_driver.h"
 #include "test/i420_video_source.h"
 #include "test/util.h"
 #include "test/y4m_video_source.h"
-#include "aom_ports/aom_timer.h"
 
 namespace {
 
@@ -164,7 +162,7 @@
 
         printf("{\n");
         printf("\t\"type\" : \"encode_perf_test\",\n");
-        printf("\t\"version\" : \"%s\",\n", VERSION_STRING_NOSP);
+        printf("\t\"version\" : \"%s\",\n", aom_codec_version_str());
         printf("\t\"videoName\" : \"%s\",\n", display_name.c_str());
         printf("\t\"encodeTimeSecs\" : %f,\n", elapsed_secs);
         printf("\t\"totalFrames\" : %u,\n", frames);