27241a7a96
The original commit broke aosp-master-with-phones, because of
vendor libraries the depended on the int versions of libbase functions.
This patch reverts the revert, and also adds ABI-compatibility shims for
the replaced functions.
This reverts commit 2c58e1924a.
Bug: http://b/131312539
Test: treehugger
Test: forrest run of aosp-master-with-phones
Change-Id: I75cc84ec8d963e20862f7662e8e2f409471f41cc
39 lines
1.1 KiB
C++
39 lines
1.1 KiB
C++
/*
|
|
* Copyright (C) 2016 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.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
|
|
#include <android-base/unique_fd.h>
|
|
|
|
#if defined(_WIN32)
|
|
// Helper to automatically close an FD when it goes out of scope.
|
|
struct AdbCloser {
|
|
static void Close(int fd);
|
|
};
|
|
|
|
using unique_fd = android::base::unique_fd_impl<AdbCloser>;
|
|
#else
|
|
using unique_fd = android::base::unique_fd;
|
|
#endif
|
|
|
|
using android::base::borrowed_fd;
|
|
|
|
template <typename T>
|
|
int adb_close(const android::base::unique_fd_impl<T>&)
|
|
__attribute__((__unavailable__("adb_close called on unique_fd")));
|