From 61a18ade33d0e163f621cbb94622c2f448bc524d Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Fri, 3 Nov 2017 21:46:00 -0600
Subject: [PATCH] msm8974-common: libshims: Import libshim_cutils_atomic

* After two years of warning us, Google has dropped non-inlined
  versions of the android_atomic functions. Unfortunately, some
  legacy blobs still expect these to be in libcutils.
* atomic.c from system/core/libcutils at c56648948

Change-Id: I31cba78c62b17f045fa912534dd61c8aaaddaaa8
---
 libshims/Android.mk                       | 17 +++++++++++++
 libshims/libshim_cutils_atomic/Android.mk | 29 +++++++++++++++++++++++
 libshims/libshim_cutils_atomic/atomic.c   | 26 ++++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 libshims/Android.mk
 create mode 100644 libshims/libshim_cutils_atomic/Android.mk
 create mode 100644 libshims/libshim_cutils_atomic/atomic.c

diff --git a/libshims/Android.mk b/libshims/Android.mk
new file mode 100644
index 0000000..37483e0
--- /dev/null
+++ b/libshims/Android.mk
@@ -0,0 +1,17 @@
+#
+# 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 $(call first-makefiles-under,$(call my-dir))
diff --git a/libshims/libshim_cutils_atomic/Android.mk b/libshims/libshim_cutils_atomic/Android.mk
new file mode 100644
index 0000000..1c31545
--- /dev/null
+++ b/libshims/libshim_cutils_atomic/Android.mk
@@ -0,0 +1,29 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libshim_cutils_atomic
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
+
+LOCAL_SRC_FILES := \
+    atomic.c
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/libshims/libshim_cutils_atomic/atomic.c b/libshims/libshim_cutils_atomic/atomic.c
new file mode 100644
index 0000000..d34aa00
--- /dev/null
+++ b/libshims/libshim_cutils_atomic/atomic.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2007 The Android Open Source 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.
+ */
+
+/*
+ * Generate non-inlined versions of android_atomic functions.
+ * Nobody should be using these, but some binary blobs currently (late 2014)
+ * are.
+ * If you read this in 2015 or later, please try to delete this file.
+ */
+
+#define ANDROID_ATOMIC_INLINE
+
+#include <cutils/atomic.h>