summaryrefslogtreecommitdiff
path: root/rs
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2017-05-01 12:56:08 -0700
committerSteven Moreland <smoreland@google.com>2017-05-01 12:56:08 -0700
commitdc01e938c2550390a540311b22e3e6c7603ed975 (patch)
treebf1e91800318b561d1123c236934a6ca3a133043 /rs
parent51dbd726e8d8130fd10dccd183800198dff3e0b4 (diff)
RenderScript: IWYU
Renderscript was depending on macros from android-base that were transitively included from MQDescriptor.h Test: links Bug: 37791060 Change-Id: Ie34ddef67328c5fcc6b0122a32725b980615ff43
Diffstat (limited to 'rs')
-rw-r--r--rs/jni/Android.mk3
-rw-r--r--rs/jni/android_renderscript_RenderScript.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk
index 4040db36c4fb..21438e04f38c 100644
--- a/rs/jni/Android.mk
+++ b/rs/jni/Android.mk
@@ -18,7 +18,8 @@ LOCAL_SHARED_LIBRARIES := \
libgui \
libjnigraphics
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_HEADER_LIBRARIES := \
+ libbase_headers
LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE) \
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index f6d3f4835381..ee48289731a8 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -27,6 +27,7 @@
#include <androidfw/Asset.h>
#include <androidfw/AssetManager.h>
#include <androidfw/ResourceTypes.h>
+#include <android-base/macros.h>
#include "jni.h"
#include "JNIHelp.h"