Merge "Grab macros from libbase instead of duplicating"

tools/aidl/Android.mk

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

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