Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ec4cbf4f: Merge "Grab macros from libbase instead of duplicating"

Browse Source 
* commit 'ec4cbf4f93ddb14653c27bfd7a169e010b87286c':
  Grab macros from libbase instead of duplicating
This commit is contained in:
Casey Dahlin
2015-09-11 02:41:43 +00:00
committed by Android Git Automerger
parent d880e1cb0c ec4cbf4f93
commit 3230b2b2b7
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/aidl/Android.mk
View File

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

3
tools/aidl/aidl_language.h
View File

@@ -1,10 +1,9 @@
#ifndef AIDL_AIDL_LANGUAGE_H_ #ifndef AIDL_AIDL_LANGUAGE_H_
#define AIDL_AIDL_LANGUAGE_H_ #define AIDL_AIDL_LANGUAGE_H_
#include <base/macros.h>
#include <string> #include <string>
#include "macros.h"
typedef enum { typedef enum {
NO_EXTRA_TEXT = 0, NO_EXTRA_TEXT = 0,
SHORT_COMMENT, SHORT_COMMENT,

8
tools/aidl/macros.h
View File

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