diff options
| author | Casey Dahlin <sadmac@google.com> | 2015-09-10 18:43:04 -0700 |
|---|---|---|
| committer | Casey Dahlin <sadmac@google.com> | 2015-09-10 18:43:04 -0700 |
| commit | 2535cae005512494469fc5cea1fe630288ecb083 (patch) | |
| tree | 96e3600bb6b74814c27ba31ecec57afb778b7cb1 | |
| parent | 96786829c23cf56a776f6ec022fdbe18a0732add (diff) | |
Grab macros from libbase instead of duplicating
Change-Id: I1802f60a4dac45ddee8cd5715a73c77e4371d7e8
Signed-off-by: Casey Dahlin <sadmac@google.com>
| -rw-r--r-- | tools/aidl/Android.mk | 3 | ||||
| -rw-r--r-- | tools/aidl/aidl_language.h | 3 | ||||
| -rw-r--r-- | tools/aidl/macros.h | 8 |
3 files changed, 4 insertions, 10 deletions
diff --git a/tools/aidl/Android.mk b/tools/aidl/Android.mk index d11264e7da5e..9f003c020e3a 100644 --- a/tools/aidl/Android.mk +++ b/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) diff --git a/tools/aidl/aidl_language.h b/tools/aidl/aidl_language.h index f3a126e9f57a..99a96899bb39 100644 --- a/tools/aidl/aidl_language.h +++ b/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, diff --git a/tools/aidl/macros.h b/tools/aidl/macros.h deleted file mode 100644 index 67b8076404a4..000000000000 --- a/tools/aidl/macros.h +++ /dev/null @@ -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_ |