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

Commit de2ad457 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Gerrit Code Review
Browse files

Merge "Revert "Grab macros from libbase instead of duplicating""

parents 3460304c f3c2ed13

tools/aidl/Android.mk

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

    search_path.cpp \



LOCAL_SHARED_LIBRARIES := \

    libbase \



include $(BUILD_HOST_STATIC_LIBRARY)

tools/aidl/aidl_language.h

+2 −1
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

0 → 100644
+8 −0
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_