From 02ff976065650f37a3e249da5ae7e9eb04ccc2ca Mon Sep 17 00:00:00 2001
From: Tom Cherry <tomcherry@google.com>
Date: Tue, 14 Jan 2020 09:55:28 -0800
Subject: [PATCH] liblog: remove log_portability.h

__BEGIN_DECLS and __END_DECLS are all that are left, and I can compile
with using normal <sys/cdefs.h>, so hopefully we can remove this at
last.

Test: build
Change-Id: I6df7ef0da027bb91c98806e0f9661d7416ebaa5d
---
 liblog/fake_log_device.h |  3 +--
 liblog/log_portability.h | 33 ---------------------------------
 liblog/logd_reader.h     |  2 +-
 liblog/logger.h          |  1 -
 liblog/pmsg_reader.h     |  2 +-
 5 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 liblog/log_portability.h

diff --git a/liblog/fake_log_device.h b/liblog/fake_log_device.h
index a2b40e214..53f1b4176 100644
--- a/liblog/fake_log_device.h
+++ b/liblog/fake_log_device.h
@@ -16,12 +16,11 @@
 
 #pragma once
 
+#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <android/log.h>
 
-#include "log_portability.h"
-
 __BEGIN_DECLS
 
 void FakeClose();
diff --git a/liblog/log_portability.h b/liblog/log_portability.h
deleted file mode 100644
index 15600d5ec..000000000
--- a/liblog/log_portability.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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 <sys/cdefs.h>
-#include <unistd.h>
-
-/* possible missing definitions in sys/cdefs.h */
-
-/* DECLS */
-#ifndef __BEGIN_DECLS
-#if defined(__cplusplus)
-#define __BEGIN_DECLS extern "C" {
-#define __END_DECLS }
-#else
-#define __BEGIN_DECLS
-#define __END_DECLS
-#endif
-#endif
diff --git a/liblog/logd_reader.h b/liblog/logd_reader.h
index 2d032fa22..68eef027a 100644
--- a/liblog/logd_reader.h
+++ b/liblog/logd_reader.h
@@ -16,10 +16,10 @@
 
 #pragma once
 
+#include <sys/cdefs.h>
 #include <unistd.h>
 
 #include "log/log_read.h"
-#include "log_portability.h"
 
 __BEGIN_DECLS
 
diff --git a/liblog/logger.h b/liblog/logger.h
index 17017337d..ddff19dd5 100644
--- a/liblog/logger.h
+++ b/liblog/logger.h
@@ -21,7 +21,6 @@
 
 #include <log/log.h>
 
-#include "log_portability.h"
 #include "uio.h"
 
 __BEGIN_DECLS
diff --git a/liblog/pmsg_reader.h b/liblog/pmsg_reader.h
index 53746d83f..b784f9ff5 100644
--- a/liblog/pmsg_reader.h
+++ b/liblog/pmsg_reader.h
@@ -16,10 +16,10 @@
 
 #pragma once
 
+#include <sys/cdefs.h>
 #include <unistd.h>
 
 #include "log/log_read.h"
-#include "log_portability.h"
 
 __BEGIN_DECLS