diff options
| author | Elliott Hughes <enh@google.com> | 2016-05-10 15:55:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-10 15:55:22 +0000 |
| commit | c5016de66b6d778dd7c292e215aad6b5c079e92c (patch) | |
| tree | 0d1c871a88f44a323d033ab8f86592e7f87acd5d | |
| parent | 179fea40bb1ed2da183f3a2a6398d1c68b9f6f32 (diff) | |
| parent | 103e8f5608a3aae3f87760cdaf2074d55467ddc5 (diff) | |
| download | core-c5016de66b6d778dd7c292e215aad6b5c079e92c.tar.gz core-c5016de66b6d778dd7c292e215aad6b5c079e92c.tar.bz2 core-c5016de66b6d778dd7c292e215aad6b5c079e92c.zip | |
Merge "<cutils/atomic.h> has been inlined for two years now."
| -rw-r--r-- | libcutils/Android.mk | 1 | ||||
| -rw-r--r-- | libcutils/atomic.c | 26 |
2 files changed, 0 insertions, 27 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index c0d4d76cf..b5780b865 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -17,7 +17,6 @@ LOCAL_PATH := $(my-dir) include $(CLEAR_VARS) libcutils_common_sources := \ - atomic.c.arm \ config_utils.c \ fs_config.c \ hashmap.c \ diff --git a/libcutils/atomic.c b/libcutils/atomic.c deleted file mode 100644 index d34aa0081..000000000 --- a/libcutils/atomic.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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> |