summaryrefslogtreecommitdiffstats
path: root/adb/adb_client.c
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-02-24 15:51:19 -0800
committerDan Albert <danalbert@google.com>2015-02-24 21:30:22 -0800
commit7664901a355b959f312e9acff5a0fd31b7139623 (patch)
tree4eae06ed28a7a20c454d9f4b59c6798a06644dad /adb/adb_client.c
parent5329d3fd54fa875bb7de78a8c40134cc63921c64 (diff)
downloadcore-7664901a355b959f312e9acff5a0fd31b7139623.tar.gz
core-7664901a355b959f312e9acff5a0fd31b7139623.tar.bz2
core-7664901a355b959f312e9acff5a0fd31b7139623.zip
Move transport declarations into transport.h.
There are a few cloexec issues in here as an added bonus. Change-Id: I1699d719d733f47878bdba0454230cf5ab6a60b6
Diffstat (limited to 'adb/adb_client.c')
-rw-r--r--adb/adb_client.c27
1 files changed, 22 insertions, 5 deletions
diff --git a/adb/adb_client.c b/adb/adb_client.c
index ac5e15a92..9bf7b2bb2 100644
--- a/adb/adb_client.c
+++ b/adb/adb_client.c
@@ -1,17 +1,34 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+/*
+ * Copyright (C) 2015 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.
+ */
+
#include <errno.h>
#include <limits.h>
#include <stdarg.h>
-#include <zipfile/zipfile.h>
-#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <sys/stat.h>
+#include <sys/types.h>
#include "sysdeps.h"
#define TRACE_TAG TRACE_ADB
#include "adb_client.h"
+#include "transport.h"
+#include "zipfile/zipfile.h"
static transport_type __adb_transport = kTransportAny;
static const char* __adb_serial = NULL;