Browse Source

Don't pull abi_test.cc into non-GTest targets.

The test_support is kind of a mess right now because it's sometimes used in
GTest targets and sometimes not. It really should be split into two libraries,
but do this for now to unbreak the Android build.

Change-Id: I7cd2b0f6ed9eda1a529ec3c69a92390e20da66f8
Reviewed-on: https://boringssl-review.googlesource.com/c/35084
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
kris/onging/CECPQ3_patch15
David Benjamin 5 years ago
committed by CQ bot account: commit-bot@chromium.org
parent
commit
c3889634a1
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      util/generate_build_files.py

+ 2
- 1
util/generate_build_files.py View File

@@ -415,7 +415,7 @@ def NoTestRunnerFiles(path, dent, is_dir):




def NotGTestSupport(path, dent, is_dir): def NotGTestSupport(path, dent, is_dir):
return 'gtest' not in dent
return 'gtest' not in dent and 'abi_test' not in dent




def SSLHeaderFiles(path, dent, is_dir): def SSLHeaderFiles(path, dent, is_dir):
@@ -627,6 +627,7 @@ def main(platforms):


crypto_test_files += FindCFiles(os.path.join('src', 'crypto'), OnlyTests) crypto_test_files += FindCFiles(os.path.join('src', 'crypto'), OnlyTests)
crypto_test_files += [ crypto_test_files += [
'src/crypto/test/abi_test.cc',
'src/crypto/test/file_test_gtest.cc', 'src/crypto/test/file_test_gtest.cc',
'src/crypto/test/gtest_main.cc', 'src/crypto/test/gtest_main.cc',
] ]


Loading…
Cancel
Save