BaseTools: Make brotli a submodule

Use submodule way to access brotli in BaseTools based on
brotli version 666c328.
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2558

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli"]
 	path = MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
 	url = https://github.com/google/brotli
+[submodule "BaseTools/Source/C/BrotliCompress/brotli"]
+	path = BaseTools/Source/C/BrotliCompress/brotli
+	url = https://github.com/google/brotli

.pytool/CISettings.py

@@ -148,6 +148,8 @@ def GetRequiredSubmodules(self):
             "MdeModulePkg/Universal/RegularExpressionDxe/oniguruma", False))
         rs.append(RequiredSubmodule(
             "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli", False))
+        rs.append(RequiredSubmodule(
+            "BaseTools/Source/C/BrotliCompress/brotli", False))
         return rs
 
     def GetName(self):

BaseTools/Source/C/BrotliCompress/GNUmakefile

@@ -1,41 +1,41 @@
 ## @file
 # GNU/Linux makefile for 'Brotli' module build.
 #
-# Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020, Intel Corporation. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 MAKEROOT ?= ..
 
 APPNAME = Brotli
 
 OBJECTS = \
-  tools/brotli.o \
-  common/dictionary.o \
-  common/transform.o \
-  dec/bit_reader.o \
-  dec/decode.o \
-  dec/huffman.o \
-  dec/state.o \
-  enc/backward_references.o \
-  enc/backward_references_hq.o \
-  enc/bit_cost.o \
-  enc/block_splitter.o \
-  enc/brotli_bit_stream.o \
-  enc/cluster.o \
-  enc/compress_fragment.o \
-  enc/compress_fragment_two_pass.o \
-  enc/dictionary_hash.o \
-  enc/encode.o \
-  enc/encoder_dict.o \
-  enc/entropy_encode.o \
-  enc/histogram.o \
-  enc/literal_cost.o \
-  enc/memory.o \
-  enc/metablock.o \
-  enc/static_dict.o \
-  enc/utf8_util.o
+  brotli/c/tools/brotli.o \
+  brotli/c/common/dictionary.o \
+  brotli/c/common/transform.o \
+  brotli/c/dec/bit_reader.o \
+  brotli/c/dec/decode.o \
+  brotli/c/dec/huffman.o \
+  brotli/c/dec/state.o \
+  brotli/c/enc/backward_references.o \
+  brotli/c/enc/backward_references_hq.o \
+  brotli/c/enc/bit_cost.o \
+  brotli/c/enc/block_splitter.o \
+  brotli/c/enc/brotli_bit_stream.o \
+  brotli/c/enc/cluster.o \
+  brotli/c/enc/compress_fragment.o \
+  brotli/c/enc/compress_fragment_two_pass.o \
+  brotli/c/enc/dictionary_hash.o \
+  brotli/c/enc/encode.o \
+  brotli/c/enc/encoder_dict.o \
+  brotli/c/enc/entropy_encode.o \
+  brotli/c/enc/histogram.o \
+  brotli/c/enc/literal_cost.o \
+  brotli/c/enc/memory.o \
+  brotli/c/enc/metablock.o \
+  brotli/c/enc/static_dict.o \
+  brotli/c/enc/utf8_util.o
 
 include $(MAKEROOT)/Makefiles/app.makefile
 
-TOOL_INCLUDE = -I ./include
+TOOL_INCLUDE = -I ./brotli/c/include
 LIBS += -lm

BaseTools/Source/C/BrotliCompress/Makefile

@@ -1,46 +1,46 @@
 ## @file
 # Windows makefile for 'Brotli' module build.
 #
-# Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020, Intel Corporation. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 !INCLUDE ..\Makefiles\ms.common
 
-INC = -I .\include $(INC)
+INC = -I .\brotli\c\include $(INC)
 CFLAGS = $(CFLAGS) /W2
 
 APPNAME = Brotli
 
 #LIBS = $(LIB_PATH)\Common.lib
 
-COMMON_OBJ = common\dictionary.obj common\transform.obj
+COMMON_OBJ = brotli\c\common\dictionary.obj brotli\c\common\transform.obj
 DEC_OBJ = \
-  dec\bit_reader.obj \
-  dec\decode.obj \
-  dec\huffman.obj \
-  dec\state.obj
+  brotli\c\dec\bit_reader.obj \
+  brotli\c\dec\decode.obj \
+  brotli\c\dec\huffman.obj \
+  brotli\c\dec\state.obj
 ENC_OBJ = \
-  enc\backward_references.obj \
-  enc\backward_references_hq.obj \
-  enc\bit_cost.obj \
-  enc\block_splitter.obj \
-  enc\brotli_bit_stream.obj \
-  enc\cluster.obj \
-  enc\compress_fragment.obj \
-  enc\compress_fragment_two_pass.obj \
-  enc\dictionary_hash.obj \
-  enc\encode.obj \
-  enc\encoder_dict.obj \
-  enc\entropy_encode.obj \
-  enc\histogram.obj \
-  enc\literal_cost.obj \
-  enc\memory.obj \
-  enc\metablock.obj \
-  enc\static_dict.obj \
-  enc\utf8_util.obj
+  brotli\c\enc\backward_references.obj \
+  brotli\c\enc\backward_references_hq.obj \
+  brotli\c\enc\bit_cost.obj \
+  brotli\c\enc\block_splitter.obj \
+  brotli\c\enc\brotli_bit_stream.obj \
+  brotli\c\enc\cluster.obj \
+  brotli\c\enc\compress_fragment.obj \
+  brotli\c\enc\compress_fragment_two_pass.obj \
+  brotli\c\enc\dictionary_hash.obj \
+  brotli\c\enc\encode.obj \
+  brotli\c\enc\encoder_dict.obj \
+  brotli\c\enc\entropy_encode.obj \
+  brotli\c\enc\histogram.obj \
+  brotli\c\enc\literal_cost.obj \
+  brotli\c\enc\memory.obj \
+  brotli\c\enc\metablock.obj \
+  brotli\c\enc\static_dict.obj \
+  brotli\c\enc\utf8_util.obj
 
 OBJECTS = \
-  tools\brotli.obj \
+  brotli\c\tools\brotli.obj \
   $(COMMON_OBJ) \
   $(DEC_OBJ) \
   $(ENC_OBJ)