add atomic shim to libxlog

Change-Id: Ia598572a4090ada36baaf4807afea67cbc934241

diff --git a/libxlog/Android.mk b/libxlog/Android.mk
index c5ce09b455973805d6eefcccdbc1269440cbbdbc..18baf61fa26951817da8354811e1690ad6353095 100644 (file)
--- a/libxlog/Android.mk
+++ b/libxlog/Android.mk
@@ -19,7 +19,7 @@ include $(CLEAR_VARS)
 
 LOCAL_CFLAGS += $(LIBLOG_CFLAGS)
 LOCAL_MODULE := libxlog
-LOCAL_SRC_FILES := xlog.c mtkaudio.cpp
+LOCAL_SRC_FILES := atomic.cpp xlog.c mtkaudio.cpp
 LOCAL_C_INCLUDES += frameworks/av/media/mtp/ system/core/include/ frameworks/rs/server/ frameworks/av/include/ hardware/libhardware/include/
 LOCAL_SHARED_LIBRARIES := libcutils liblog libutils libbinder
 

diff --git a/libxlog/atomic.cpp b/libxlog/atomic.cpp
new file mode 100644 (file)
index 0000000..3a159e2
--- /dev/null
+++ b/libxlog/atomic.cpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2017 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <string>
+#define ANDROID_ATOMIC_INLINE
+extern "C" {
+#include <cutils/atomic.h>
+}

diff --git a/libxlog/mtkaudio.cpp b/libxlog/mtkaudio.cpp
index 78ad443c9704ec84db2382423fd672b065961e6c..049ed85deb9937d005c261decea7527a8b38f4eb 100644 (file)
--- a/libxlog/mtkaudio.cpp
+++ b/libxlog/mtkaudio.cpp
@@ -1,6 +1,6 @@
 #include <MtpTypes.h>
 #include <system/audio.h>
-#include <StrongPointer.h>
+#include <utils/StrongPointer.h>
 #include <media/IAudioFlinger.h>
 #include <hardware/audio.h>
 #include <stdlib.h>