diff options
| author | Brian Carlstrom <bdc@google.com> | 2015-09-11 05:09:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-11 05:09:17 +0000 |
| commit | de2ad45784499388d09f2c2c3bcf2fa1966cf018 (patch) | |
| tree | bf5ca8d26c26e006f2ab79412ec9e892c6bcd5fd /tools/aidl | |
| parent | 3460304c5c656b2cbf2b371720edff4fd662b02d (diff) | |
| parent | f3c2ed13d0d343255a4c7624276a0608fcfecfae (diff) | |
Merge "Revert "Grab macros from libbase instead of duplicating""
Diffstat (limited to 'tools/aidl')
| -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, 10 insertions, 4 deletions
diff --git a/tools/aidl/Android.mk b/tools/aidl/Android.mk index 9f003c020e3a..d11264e7da5e 100644 --- a/tools/aidl/Android.mk +++ b/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) diff --git a/tools/aidl/aidl_language.h b/tools/aidl/aidl_language.h index 99a96899bb39..f3a126e9f57a 100644 --- a/tools/aidl/aidl_language.h +++ b/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, diff --git a/tools/aidl/macros.h b/tools/aidl/macros.h new file mode 100644 index 000000000000..67b8076404a4 --- /dev/null +++ b/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_ |