Merge "Fix two intrinsic clipping bugs." into lmp-dev
diff --git a/java/Android.mk b/java/Android.mk
index fdcbf97..c8f64ce 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -1,11 +1,7 @@
LOCAL_PATH:=$(call my-dir)
-ifneq ($(TARGET_ARCH), arm64)
-
# Only build our tests if we doing a top-level build. Do not build the
# tests if we are just doing an mm or mmm in frameworks/rs.
ifeq (,$(ONE_SHOT_MAKEFILE))
include $(call all-makefiles-under,$(LOCAL_PATH))
endif
-
-endif
\ No newline at end of file
diff --git a/java/tests/HelloComputeNDK/Android.mk b/java/tests/HelloComputeNDK/Android.mk
index 58b95aa..830399e 100644
--- a/java/tests/HelloComputeNDK/Android.mk
+++ b/java/tests/HelloComputeNDK/Android.mk
@@ -24,6 +24,7 @@
LOCAL_PACKAGE_NAME := HelloComputeNDK
LOCAL_SDK_VERSION := 14
+LOCAL_32_BIT_ONLY := true
LOCAL_JNI_SHARED_LIBRARIES := libhellocomputendk
diff --git a/rsAllocation.cpp b/rsAllocation.cpp
index 8ea17b8..0443ee8 100644
--- a/rsAllocation.cpp
+++ b/rsAllocation.cpp
@@ -488,7 +488,7 @@
#ifndef RS_COMPATIBILITY_LIB
void Allocation::NewBufferListener::onFrameAvailable() {
intptr_t ip = (intptr_t)alloc;
- rsc->sendMessageToClient(NULL, RS_MESSAGE_TO_CLIENT_NEW_BUFFER, ip, 0, true);
+ rsc->sendMessageToClient(&ip, RS_MESSAGE_TO_CLIENT_NEW_BUFFER, 0, sizeof(ip), true);
}
#endif
diff --git a/rsThreadIO.cpp b/rsThreadIO.cpp
index 8a0a5dc..4f67dbb 100644
--- a/rsThreadIO.cpp
+++ b/rsThreadIO.cpp
@@ -213,7 +213,7 @@
//ALOGE("sendToClient %i %i %i", cmdID, usrID, (int)dataLen);
ClientCmdHeader hdr;
- hdr.bytes = dataLen;
+ hdr.bytes = (uint32_t)dataLen;
hdr.cmdID = cmdID;
hdr.userID = usrID;