Finish switch to angle_version.h.

BUILD.gn

@@ -661,17 +661,8 @@ action("angle_commit_id") {
   public_configs = [ ":angle_commit_id_config" ]
 }
 
-# TODO(jmadill): Remove this. http://b/168736059
-group("commit_id") {
-  data_deps = [ ":angle_commit_id" ]
-}
-
 angle_source_set("angle_version") {
-  # TODO(jmadill): Remove version.h. http://b/168736059
-  sources = [
-    "src/common/angle_version.h",
-    "src/common/version.h",
-  ]
+  sources = [ "src/common/angle_version.h" ]
   public_deps = [ ":angle_commit_id" ]
 }
 

src/common/version.h

-//
-// Copyright 2014 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// angle_version.h: ANGLE version constants. Generated from git commands.
-
-#ifndef COMMON_VERSION_H_
-#define COMMON_VERSION_H_
-
-#include "angle_commit.h"
-
-#define ANGLE_MAJOR_VERSION 2
-#define ANGLE_MINOR_VERSION 1
-
-#ifndef ANGLE_REVISION
-#    define ANGLE_REVISION ANGLE_COMMIT_POSITION
-#endif
-
-#define ANGLE_STRINGIFY(x) #x
-#define ANGLE_MACRO_STRINGIFY(x) ANGLE_STRINGIFY(x)
-
-#define ANGLE_VERSION_STRING                                                  \
-    ANGLE_MACRO_STRINGIFY(ANGLE_MAJOR_VERSION)                                \
-    "." ANGLE_MACRO_STRINGIFY(ANGLE_MINOR_VERSION) "." ANGLE_MACRO_STRINGIFY( \
-        ANGLE_REVISION) " git hash: " ANGLE_COMMIT_HASH
-
-#endif  // COMMON_VERSION_H_

src/libANGLE/capture/FrameCapture.cpp

@@ -16,10 +16,10 @@
 
 #include "sys/stat.h"
 
+#include "common/angle_version.h"
 #include "common/mathutil.h"
 #include "common/string_utils.h"
 #include "common/system_utils.h"
-#include "common/version.h"
 #include "libANGLE/Config.h"
 #include "libANGLE/Context.h"
 #include "libANGLE/Display.h"

src/libGLESv2/egl_stubs.cpp

@@ -8,7 +8,7 @@
 
 #include "libGLESv2/egl_stubs_autogen.h"
 
-#include "common/version.h"
+#include "common/angle_version.h"
 #include "libANGLE/Context.h"
 #include "libANGLE/Display.h"
 #include "libANGLE/EGLSync.h"