commit 5bd11b48875846b304e782afc537b4b4b8a6eb39
author Colin Cross <ccross@android.com> Fri Jan 24 00:26:59 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 24 00:26:59 2014 +0000
tree d93222d37b640aebf25b3eea3abf20dcbf9ff8c5
parent 1db584b899dffca884c3842c07da189f7c9af470
parent 65dd88beccc571315ffc5d9cce90402d0426a28b

Merge changes Ib13d9654,I98723ccd

* changes:
  system/core: remove $(KERNEL_HEADERS) from includes
  libcutils: fix atomic_memory_store_barrier

include/cutils/atomic-aarch64.h

diff --git a/include/cutils/atomic-aarch64.h b/include/cutils/atomic-aarch64.h
index 927379f..4562ad0 100644
--- a/include/cutils/atomic-aarch64.h
+++ b/include/cutils/atomic-aarch64.h
@@ -66,7 +66,7 @@
 extern ANDROID_ATOMIC_INLINE
 void android_memory_store_barrier(void)
 {
-    __asm__ __volatile__ ("dmb isht" : : : "memory");
+    __asm__ __volatile__ ("dmb ishst" : : : "memory");
 }
 #endif
 

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index f8dda36..c08a50f 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -124,7 +124,7 @@
     endif # !x86
 endif # !arm
 
-LOCAL_C_INCLUDES := $(libcutils_c_includes) $(KERNEL_HEADERS)
+LOCAL_C_INCLUDES := $(libcutils_c_includes)
 LOCAL_STATIC_LIBRARIES := liblog
 LOCAL_CFLAGS += $(targetSmpFlag)
 include $(BUILD_STATIC_LIBRARY)

libsysutils/Android.mk

diff --git a/libsysutils/Android.mk b/libsysutils/Android.mk
index 1d396b2..1451b0d 100644
--- a/libsysutils/Android.mk
+++ b/libsysutils/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_MODULE:= libsysutils
 
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS)
+LOCAL_C_INCLUDES :=
 
 LOCAL_CFLAGS :=