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
This commit is contained in:
Elliott Hughes 2016-05-10 16:03:51 +00:00 committed by android-build-merger
commit bc72a54073
2 changed files with 0 additions and 27 deletions

View file

@ -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 \

View file

@ -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>