diff options
author | Darren Krahn <dkrahn@google.com> | 2016-01-25 19:50:57 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-25 19:50:57 +0000 |
commit | 0e860e79fefad0327d7256ebf6ea273eeacc8e6f (patch) | |
tree | cb855003644f45c7d7e7d21974e9d39da2ba4e54 | |
parent | f71393a1fa1b6f036bcc74b770d044845d9dee07 (diff) | |
parent | df1a065bda6422a3f2c013c3a63bb0e0f39150a8 (diff) | |
download | tpm-0e860e79fefad0327d7256ebf6ea273eeacc8e6f.tar.gz |
Merge "trunks: Fix generator to match manual changes."
-rwxr-xr-x | trunks/generator/generator.py | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/trunks/generator/generator.py b/trunks/generator/generator.py index 09b6cd2..1aa4a4f 100755 --- a/trunks/generator/generator.py +++ b/trunks/generator/generator.py @@ -81,21 +81,22 @@ _BASIC_TYPES = ['uint8_t', 'int8_t', 'int', 'uint16_t', 'int16_t', _OUTPUT_FILE_H = 'tpm_generated.h' _OUTPUT_FILE_CC = 'tpm_generated.cc' _COPYRIGHT_HEADER = ( - '// \n' - '// Copyright (C) 2015 The Android Open Source Project \n' - '// \n' - '// Licensed under the Apache License, Version 2.0 (the "License"); \n' - '// you may not use this file except in compliance with the License. \n' - '// \n' - '// http://www.apache.org/licenses/LICENSE-2.0 \n' - '// \n' - '// Unless required by applicable law or agreed to in writing, software \n' - '// distributed under the License is distributed on an "AS IS" BASIS, \n' + '//\n' + '// Copyright (C) 2015 The Android Open Source Project\n' + '//\n' + '// Licensed under the Apache License, Version 2.0 (the "License");\n' + '// you may not use this file except in compliance with the License.\n' + '// You may obtain a copy of the License at\n' + '//\n' + '// http://www.apache.org/licenses/LICENSE-2.0\n' + '//\n' + '// Unless required by applicable law or agreed to in writing, software\n' + '// distributed under the License is distributed on an "AS IS" BASIS,\n' '// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or ' - 'implied. \n' - '// See the License for the specific language governing permissions and \n' - '// limitations under the License. \n' - '// \n' + 'implied.\n' + '// See the License for the specific language governing permissions and\n' + '// limitations under the License.\n' + '//\n\n' '// THIS CODE IS GENERATED - DO NOT MODIFY!\n') _HEADER_FILE_GUARD_HEADER = """ #ifndef %(name)s @@ -107,18 +108,18 @@ _HEADER_FILE_GUARD_FOOTER = """ _HEADER_FILE_INCLUDES = """ #include <string> -#include <base/basictypes.h> #include <base/callback_forward.h> +#include <base/macros.h> #include "trunks/trunks_export.h" """ _IMPLEMENTATION_FILE_INCLUDES = """ #include <string> -#include <base/basictypes.h> #include <base/bind.h> #include <base/callback.h> #include <base/logging.h> +#include <base/macros.h> #include <base/stl_util.h> #include <base/strings/string_number_conversions.h> #include <base/sys_byteorder.h> |