Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab15ac08 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

Merge commit 'goog/master' into merge_master

parents 8cd81ab3 fec96170

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ else 
  include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \

	      adb \

	      libcutils \

	      libsysutils \

	      liblog \

	      libnetutils \

	      libpixelflinger \

adb/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ LOCAL_PATH:= $(call my-dir) 


# adb host tool

# =========================================================

ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean (also unused with the sim)

include $(CLEAR_VARS)



# Default to a virtual (sockets) usb interface
@@ -77,7 +76,6 @@ ifeq ($(HOST_OS),windows) 
$(LOCAL_INSTALLED_MODULE): $(HOST_OUT_EXECUTABLES)/AdbWinApi.dll

endif



endif



# adbd device daemon

# =========================================================

fastboot/fastboot.c

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ void usage(void) 
            "  -p <product>                             specify product name\n"

            "  -c <cmdline>                             override kernel commandline\n"

            "  -i <vendor id>                           specify a custom USB vendor id\n"

            "  -b <base_addr>                           specify a custom kernel base address\n"

        );

    exit(1);

}

include/sysutils/FrameworkCommand.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 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.

 */

#ifndef __FRAMEWORK_CMD_HANDLER_H

#define __FRAMEWORK_CMD_HANDLER_H



#include "../../../frameworks/base/include/utils/List.h"





class FrameworkCommand { 

private:

    const char *mCommand;



public:



    FrameworkCommand(const char *cmd);

    virtual ~FrameworkCommand() { }



    virtual int runCommand(char *data);



    const char *getCommand() { return mCommand; }

};



typedef android::List<FrameworkCommand *> FrameworkCommandCollection;

#endif

include/sysutils/FrameworkListener.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 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.

 */

#ifndef _FRAMEWORKSOCKETLISTENER_H

#define _FRAMEWORKSOCKETLISTENER_H



#include "SocketListener.h"

#include "FrameworkCommand.h"



class FrameworkListener : public SocketListener {

private:

    FrameworkCommandCollection *mCommands;



public:

    FrameworkListener(const char *socketName);

    virtual ~FrameworkListener() {}



protected:

    void registerCmd(FrameworkCommand *cmd);

    virtual bool onDataAvailable(int socket);



private:

    void dispatchCommand(char *cmd);

};

#endif