commit fe30459ec638868040b1ec8df1b8642d5c1c2ad1
author Jooyung Han <jooyung@google.com> Thu Feb 21 15:12:59 2019 +0900
committer Jooyung Han <jooyung@google.com> Mon Mar 04 16:17:56 2019 +0900
tree 916eb2dd5704941aac76bb8d0cb5cc0df3714ec4
parent dd27a6a112deceed9674e275f1f6975d4b068ea9

Use libnativewindow's AHardwareBuffer directly

This is a part of cutting dependency from libmediandk to
libandroid_runtime.

The following function is exported from libandroid_runtime.
* android_hardware_HardwareBuffer_convertToGrallocUsageBits

This function just delegates to libnativewindow's
AHardwareBuffer_convertToGrallocUsageBits function.

This commit is for libmediandk to call libnativewindow's
function directly in order to cut the dependency to libandroid_runtime.

Bug: 124268753
Test: m -j
Change-Id: I5f927fc26829031a8c91a7ba51178a34d737a953
Merged-In: I5f927fc26829031a8c91a7ba51178a34d737a953

media/ndk/NdkImage.cpp

diff --git a/media/ndk/NdkImage.cpp b/media/ndk/NdkImage.cpp
index 20b1667..1883f63 100644
--- a/media/ndk/NdkImage.cpp
+++ b/media/ndk/NdkImage.cpp
@@ -23,7 +23,7 @@
 #include "NdkImageReaderPriv.h"
 
 #include <android_media_Utils.h>
-#include <android_runtime/android_hardware_HardwareBuffer.h>
+#include <private/android/AHardwareBufferHelpers.h>
 #include <utils/Log.h>
 #include "hardware/camera3.h"
 
@@ -190,7 +190,7 @@
 
     auto lockedBuffer = std::make_unique<CpuConsumer::LockedBuffer>();
 
-    uint64_t grallocUsage = android_hardware_HardwareBuffer_convertToGrallocUsageBits(mUsage);
+    uint64_t grallocUsage = AHardwareBuffer_convertToGrallocUsageBits(mUsage);
 
     status_t ret =
             lockImageFromBuffer(mBuffer, grallocUsage, mBuffer->mFence->dup(), lockedBuffer.get());

media/ndk/NdkImageReader.cpp

diff --git a/media/ndk/NdkImageReader.cpp b/media/ndk/NdkImageReader.cpp
index be635ff..9fc75f0 100644
--- a/media/ndk/NdkImageReader.cpp
+++ b/media/ndk/NdkImageReader.cpp
@@ -26,7 +26,7 @@
 #include <utils/Log.h>
 #include <android_media_Utils.h>
 #include <android_runtime/android_view_Surface.h>
-#include <android_runtime/android_hardware_HardwareBuffer.h>
+#include <private/android/AHardwareBufferHelpers.h>
 #include <grallocusage/GrallocUsageConversion.h>
 
 using namespace android;
@@ -263,7 +263,7 @@
     PublicFormat publicFormat = static_cast<PublicFormat>(mFormat);
     mHalFormat = android_view_Surface_mapPublicFormatToHalFormat(publicFormat);
     mHalDataSpace = android_view_Surface_mapPublicFormatToHalDataspace(publicFormat);
-    mHalUsage = android_hardware_HardwareBuffer_convertToGrallocUsageBits(mUsage);
+    mHalUsage = AHardwareBuffer_convertToGrallocUsageBits(mUsage);
 
     sp<IGraphicBufferProducer> gbProducer;
     sp<IGraphicBufferConsumer> gbConsumer;