diff options
-rw-r--r-- | include/cutils/atomic-aarch64.h | 2 | ||||
-rw-r--r-- | libcutils/Android.mk | 2 | ||||
-rw-r--r-- | libsysutils/Android.mk | 2 |
3 files changed, 3 insertions, 3 deletions
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 @@ void android_memory_barrier(void) extern ANDROID_ATOMIC_INLINE void android_memory_store_barrier(void) { - __asm__ __volatile__ ("dmb isht" : : : "memory"); + __asm__ __volatile__ ("dmb ishst" : : : "memory"); } #endif 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 @@ else # !arm 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) 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_SRC_FILES:= \ LOCAL_MODULE:= libsysutils -LOCAL_C_INCLUDES := $(KERNEL_HEADERS) +LOCAL_C_INCLUDES := LOCAL_CFLAGS := |