summaryrefslogtreecommitdiff
path: root/ashmemtest-expanded/ashmemtest-expanded.l
diff options
context:
space:
mode:
authorDmitry Antipov <dmitry.antipov@linaro.org>2013-02-14 17:23:32 +0400
committerDmitry Antipov <dmitry.antipov@linaro.org>2013-02-14 17:23:32 +0400
commit49923809689076225ab0c1c9df74f031b9d4310e (patch)
tree041c3c5d0e3f61ba953309e2124b915c4986716b /ashmemtest-expanded/ashmemtest-expanded.l
parent007c4ba9da5b52bc41d3d6385b1b92ff88e0ff1e (diff)
downloadlinaro-android-kernel-test-49923809689076225ab0c1c9df74f031b9d4310e.tar.gz
Sync-up with the latest juice-aosp kernel (as of build 121).
Since frameworks/native/include/utils/ashmem.h is a subject to removal, do not rely on this header and use the same header as bionic. Adjust ioctl names to match ones in kernel header.
Diffstat (limited to 'ashmemtest-expanded/ashmemtest-expanded.l')
-rw-r--r--ashmemtest-expanded/ashmemtest-expanded.l2
1 files changed, 1 insertions, 1 deletions
diff --git a/ashmemtest-expanded/ashmemtest-expanded.l b/ashmemtest-expanded/ashmemtest-expanded.l
index f13c7a5..8372be6 100644
--- a/ashmemtest-expanded/ashmemtest-expanded.l
+++ b/ashmemtest-expanded/ashmemtest-expanded.l
@@ -15,7 +15,7 @@
#include <sys/sysinfo.h>
#ifdef ANDROID
-#include <utils/ashmem.h>
+#include <linux/ashmem.h>
#else
#include "ashmem.h"
#endif