Merge "libradio_metadata: work with BOARD_VNDK_VERSION" into oc-dev am: 2f25151524

am: 82e11965ab

Change-Id: I634c0975d1d744e2c962dad829a58f98ce39eeb3

diff --git a/radio/Android.bp b/radio/Android.bp
index 35220e0..91ded20 100644 (file)
--- a/radio/Android.bp
+++ b/radio/Android.bp
@@ -13,6 +13,9 @@ cc_library_shared {
         "-fvisibility=hidden",
     ],
 
+    header_libs: ["libsystem_headers"],
+    export_header_lib_headers: ["libsystem_headers"],
+
     local_include_dirs: ["include"],
     export_include_dirs: ["include"],
 

diff --git a/radio/src/RadioMetadataWrapper.cpp b/radio/src/RadioMetadataWrapper.cpp
index d7843f2..fbb4fb0 100644 (file)
--- a/radio/src/RadioMetadataWrapper.cpp
+++ b/radio/src/RadioMetadataWrapper.cpp
@@ -2,7 +2,7 @@
 //#define LOG_NDEBUG 0
 
 #include <system/RadioMetadataWrapper.h>
-#include <utils/Log.h>
+#include <log/log.h>
 
 namespace android {