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

tools/aidl/Android.mk

@@ -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

@@ -1,9 +1,10 @@
 #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,0 +1,8 @@
+#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_