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

Commit ec4cbf4f authored by Casey Dahlin's avatar Casey Dahlin Committed by Gerrit Code Review
Browse files

Merge "Grab macros from libbase instead of duplicating"

parents 7e8586fc 2535cae0

tools/aidl/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ LOCAL_SRC_FILES := \ 
    options.cpp \

    search_path.cpp \



LOCAL_SHARED_LIBRARIES := \

    libbase \



include $(BUILD_HOST_STATIC_LIBRARY)

tools/aidl/aidl_language.h

+1 −2
Original line number Diff line number Diff line 
#ifndef AIDL_AIDL_LANGUAGE_H_

#define AIDL_AIDL_LANGUAGE_H_



#include <base/macros.h>

#include <string>



#include "macros.h"



typedef enum {

    NO_EXTRA_TEXT = 0,

    SHORT_COMMENT,

tools/aidl/macros.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
#ifndef AIDL_MACROS_H_

#define AIDL_MACROS_H_



#define DISALLOW_COPY_AND_ASSIGN(TypeName) \

  TypeName(const TypeName&);               \

  void operator=(const TypeName&)



#endif  // AIDL_MACROS_H_