Remove references to libchrome
Removed dependencies on libchrome which was used mostly for logging
and switched over to standard Android log macros.
Bug: None
Test: `m -j32` still succeeds
Change-Id: I0a841c19c15c02f9a031af200e82837f9450d88a
diff --git a/libs/vr/libgvr/shim_gvr.cpp b/libs/vr/libgvr/shim_gvr.cpp
index 264952e..fa8a655 100644
--- a/libs/vr/libgvr/shim_gvr.cpp
+++ b/libs/vr/libgvr/shim_gvr.cpp
@@ -19,10 +19,10 @@
#endif
#endif
-#include <cutils/log.h>
#include <dvr/graphics.h>
#include <dvr/performance_client_api.h>
#include <dvr/pose_client.h>
+#include <log/log.h>
#include <private/dvr/buffer_hub_queue_core.h>
#include <private/dvr/buffer_hub_queue_producer.h>
#include <private/dvr/clock_ns.h>
@@ -1326,14 +1326,14 @@
}
void* gvr_external_surface_get_surface(const gvr_external_surface* surface) {
- CHECK(surface->swap_chain != nullptr &&
- surface->swap_chain->context != nullptr &&
- surface->swap_chain->context->jni_env_ != nullptr)
- << "gvr_external_surface_get_surface: Surface must be constructed within "
- << "a JNIEnv. Check |gvr_create| call.";
+ LOG_ALWAYS_FATAL_IF(surface->swap_chain == nullptr ||
+ surface->swap_chain->context == nullptr ||
+ surface->swap_chain->context->jni_env_ == nullptr,
+ "gvr_external_surface_get_surface: Surface must be "
+ "constructed within a JNIEnv. Check |gvr_create| call.");
- CHECK(surface->video_surface != nullptr)
- << "gvr_external_surface_get_surface: Invalid surface.";
+ LOG_ALWAYS_FATAL_IF(surface->video_surface == nullptr,
+ "gvr_external_surface_get_surface: Invalid surface.");
std::shared_ptr<android::dvr::ProducerQueue> producer_queue =
surface->video_surface->client->GetProducerQueue();