Revert "Grab macros from libbase instead of duplicating"

This reverts commit 2535cae005.

Change-Id: I373844b6a0f429e88d6bcc1cdd5ac62325da55b3
This commit is contained in:
Casey Dahlin
2015-09-11 02:47:54 +00:00
parent 2535cae005
commit f3c2ed13d0
3 changed files with 10 additions and 4 deletions

View File

@@ -35,9 +35,6 @@ LOCAL_SRC_FILES := \
options.cpp \
search_path.cpp \
LOCAL_SHARED_LIBRARIES := \
libbase \
include $(BUILD_HOST_STATIC_LIBRARY)

View File

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

8
tools/aidl/macros.h Normal file
View File

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