diff options
| author | Elliott Hughes <enh@google.com> | 2016-05-10 16:03:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-10 16:03:51 +0000 |
| commit | bc72a54073054aa3a972a6f527c732d9ad000fc7 (patch) | |
| tree | 1d2eff355f46b3d2e96aa6109fb90ed339cc9b7f /libcutils | |
| parent | b3180e43c05f10f5957765875981fb350d5021df (diff) | |
| parent | 23e1312720c45944646f68379c1f15fcd8434da8 (diff) | |
| download | core-bc72a54073054aa3a972a6f527c732d9ad000fc7.tar.gz core-bc72a54073054aa3a972a6f527c732d9ad000fc7.tar.bz2 core-bc72a54073054aa3a972a6f527c732d9ad000fc7.zip | |
Merge "<cutils/atomic.h> has been inlined for two years now." am: c5016de66b
am: 23e1312720
* commit '23e1312720c45944646f68379c1f15fcd8434da8':
<cutils/atomic.h> has been inlined for two years now.
Change-Id: Ia4205030c07494149b8392abf74ec29ebd463724
Diffstat (limited to 'libcutils')
| -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 0c6e5a1cf..822a7d34b 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 \ canned_fs_config.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> |