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

Commit a72c5cf7 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 02d750ef: am 2519f9c6: am de2ad457: Merge "Revert "Grab macros from libbase... 

am 02d750ef: am 2519f9c6: am de2ad457: Merge "Revert "Grab macros from libbase instead of duplicating""

* commit '02d750ef':
  Revert "Grab macros from libbase instead of duplicating"
parents fddc91da 02d750ef

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_