From b5deb4ac2eaabce20a835b8b35b3a2f24a392c57 Mon Sep 17 00:00:00 2001
From: Myles Watson <mylesgw@google.com>
Date: Fri, 29 May 2020 12:17:43 -0700
Subject: [PATCH] RootCanal: Use GD defaults to define OS_ANDROID

When OS_ANDROID is defined logs go to logcat.
When OS_ANDROID is not defined logs to stderr.

Bug: 157706301
Test: cert/run --host
Tag: #gd-refactor
Change-Id: I3e735a4716fbc35a3d66e03909fdbf905436d285
Merged-In: I3e735a4716fbc35a3d66e03909fdbf905436d285
---
 vendor_libs/test_vendor_lib/Android.bp                       | 4 +++-
 vendor_libs/test_vendor_lib/model/devices/scripted_beacon.cc | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vendor_libs/test_vendor_lib/Android.bp b/vendor_libs/test_vendor_lib/Android.bp
index c3c08d84a..4523be59b 100644
--- a/vendor_libs/test_vendor_lib/Android.bp
+++ b/vendor_libs/test_vendor_lib/Android.bp
@@ -2,7 +2,8 @@
 // ========================================================
 cc_library_static {
     name: "libbt-rootcanal",
-    defaults: ["libchrome_support_defaults"],
+    defaults: ["gd_defaults",],
+    header_libs: ["jni_headers"],
     host_supported: true,
     proprietary: true,
     srcs: [
@@ -60,6 +61,7 @@ cc_library_static {
     ],
     shared_libs: [
         "libbase",
+        "libchrome",
         "liblog",
     ],
     static_libs: [
diff --git a/vendor_libs/test_vendor_lib/model/devices/scripted_beacon.cc b/vendor_libs/test_vendor_lib/model/devices/scripted_beacon.cc
index 490d0dfed..79f508c82 100644
--- a/vendor_libs/test_vendor_lib/model/devices/scripted_beacon.cc
+++ b/vendor_libs/test_vendor_lib/model/devices/scripted_beacon.cc
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-#define OS_ANDROID
-#include "os/log.h"
-#undef OS_ANDROID
 #include "scripted_beacon.h"
 
 #include <fstream>
@@ -29,6 +26,7 @@
 
 #include "model/devices/scripted_beacon_ble_payload.pb.h"
 #include "model/setup/device_boutique.h"
+#include "os/log.h"
 
 using std::vector;
 
-- 
2.11.0