Integrate adb with fastdeploy
Test: lunch sdk-eng && make sdk -j44
Test: lunch aosp_walleye-eng && cd system/core/adb && mm
Test: adb install -r -f --force-agent --local-agent ~/example_apks/example.apk
Test: adb install -r -f --no-streaming --force-agent --local-agent ~/example_apks/example.apk
Change-Id: Ia1c2160f87ea584656f8fdd67e314a260d39d607
diff --git a/adb/client/fastdeploycallbacks.cpp b/adb/client/fastdeploycallbacks.cpp
new file mode 100644
index 0000000..6c9a21f
--- /dev/null
+++ b/adb/client/fastdeploycallbacks.cpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2018 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.
+ */
+
+#define TRACE_TAG ADB
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+
+#include "client/file_sync_client.h"
+#include "commandline.h"
+#include "sysdeps.h"
+
+#include "fastdeploycallbacks.h"
+
+static void appendBuffer(std::vector<char>* buffer, const char* input, int length) {
+ if (buffer != NULL) {
+ buffer->insert(buffer->end(), input, input + length);
+ }
+}
+
+class DeployAgentBufferCallback : public StandardStreamsCallbackInterface {
+ public:
+ DeployAgentBufferCallback(std::vector<char>* outBuffer, std::vector<char>* errBuffer,
+ int* statusCode);
+
+ virtual void OnStdout(const char* buffer, int length);
+ virtual void OnStderr(const char* buffer, int length);
+ virtual int Done(int status);
+
+ private:
+ std::vector<char>* mpOutBuffer;
+ std::vector<char>* mpErrBuffer;
+ int* mpStatusCode;
+};
+
+int capture_shell_command(const char* command, std::vector<char>* outBuffer,
+ std::vector<char>* errBuffer) {
+ int statusCode;
+ DeployAgentBufferCallback cb(outBuffer, errBuffer, &statusCode);
+ int ret = send_shell_command(command, false, &cb);
+
+ if (ret == 0) {
+ return statusCode;
+ } else {
+ return ret;
+ }
+}
+
+DeployAgentFileCallback::DeployAgentFileCallback(FILE* outputFile, std::vector<char>* errBuffer,
+ int* statusCode) {
+ mpOutFile = outputFile;
+ mpErrBuffer = errBuffer;
+ mpStatusCode = statusCode;
+ mBytesWritten = 0;
+}
+
+void DeployAgentFileCallback::OnStdout(const char* buffer, int length) {
+ if (mpOutFile != NULL) {
+ int bytes_written = fwrite(buffer, 1, length, mpOutFile);
+ if (bytes_written != length) {
+ printf("Write error %d\n", bytes_written);
+ }
+ mBytesWritten += bytes_written;
+ }
+}
+
+void DeployAgentFileCallback::OnStderr(const char* buffer, int length) {
+ appendBuffer(mpErrBuffer, buffer, length);
+}
+
+int DeployAgentFileCallback::Done(int status) {
+ if (mpStatusCode != NULL) {
+ *mpStatusCode = status;
+ }
+ return 0;
+}
+
+int DeployAgentFileCallback::getBytesWritten() {
+ return mBytesWritten;
+}
+
+DeployAgentBufferCallback::DeployAgentBufferCallback(std::vector<char>* outBuffer,
+ std::vector<char>* errBuffer,
+ int* statusCode) {
+ mpOutBuffer = outBuffer;
+ mpErrBuffer = errBuffer;
+ mpStatusCode = statusCode;
+}
+
+void DeployAgentBufferCallback::OnStdout(const char* buffer, int length) {
+ appendBuffer(mpOutBuffer, buffer, length);
+}
+
+void DeployAgentBufferCallback::OnStderr(const char* buffer, int length) {
+ appendBuffer(mpErrBuffer, buffer, length);
+}
+
+int DeployAgentBufferCallback::Done(int status) {
+ if (mpStatusCode != NULL) {
+ *mpStatusCode = status;
+ }
+ return 0;
+}