Remove the _BORINGSSL_LIBPKI_ defines
Now that this is the source of truth, this isn't really doing anything.
Update-Note: _BORINGSSL_LIBPKI_ in build files can be removed.
Bug: 658
Change-Id: I6daacf692bf4bf51d9822d1b91237625b83d7849
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/64027
Auto-Submit: David Benjamin <davidben@google.com>
Commit-Queue: Bob Beck <bbe@google.com>
Reviewed-by: Bob Beck <bbe@google.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee5cc04..2c2eb88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -563,11 +563,9 @@
endif()
add_library(pki ${PKI_SOURCES})
-target_compile_definitions(pki PRIVATE _BORINGSSL_LIBPKI_)
target_link_libraries(pki crypto)
add_executable(pki_test ${PKI_TEST_SOURCES})
-target_compile_definitions(pki_test PRIVATE _BORINGSSL_LIBPKI_)
target_link_libraries(pki_test test_support_lib boringssl_gtest pki crypto)
add_dependencies(all_tests pki_test)
diff --git a/fuzz/CMakeLists.txt b/fuzz/CMakeLists.txt
index adf7aa5..36ec9fb 100644
--- a/fuzz/CMakeLists.txt
+++ b/fuzz/CMakeLists.txt
@@ -12,8 +12,7 @@
${name}
PROPERTIES
CXX_STANDARD 17
- CXX_STANDARD_REQUIRED YES
- COMPILE_FLAGS "-D_BORINGSSL_LIBPKI_")
+ CXX_STANDARD_REQUIRED YES)
endmacro()
fuzzer(arm_cpuinfo)
diff --git a/pki/fillins/log.h b/pki/fillins/log.h
index f0bbe61..3b6bbb5 100644
--- a/pki/fillins/log.h
+++ b/pki/fillins/log.h
@@ -9,18 +9,8 @@
// This header defines the logging macros, inherited from chrome.
-// This file is not used in chrome, so check here to make sure we are
-// only compiling inside boringssl.
-#if !defined(_BORINGSSL_LIBPKI_)
-#error "_BORINGSSL_LIBPKI_ is not defined when compiling BoringSSL libpki"
-#endif
-
-#if defined(_BORINGSSL_LIBPKI_VERBOSE_)
-#define DVLOG(l) std::cerr
-#define LOG(l) std::cerr
-#else
+// TODO(crbug.com/boringssl/663): Replace this with methods on the delegate.
#define DVLOG(l) 0 && std::cerr
#define LOG(l) 0 && std::cerr
-#endif // _BORINGSSL_LIBPKI_VERBOSE_
#endif // BSSL_FILLINS_LOG_H_
