297d9bf8ea
adb was using a custom unique_fd closer that didn't have an implementation for fdsan, which meant that none of our FDs were actually tracked. Guard this behind ifdefs so that we only use this on Windows, and delete our implementation of Pipe in favor of the one in libbase while we're at it. libbase's implementation always sets O_CLOEXEC, so fix up the instance of Pipe that doesn't expect that. Test: mma Test: adb start-server Test: debuggerd `pidof adbd` Change-Id: Ic29d641a2f93fb42384b00c51775048c8bcbe152
37 lines
1.1 KiB
C++
37 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
|
|
|
|
template <typename T>
|
|
int adb_close(const android::base::unique_fd_impl<T>&)
|
|
__attribute__((__unavailable__("adb_close called on unique_fd")));
|