diff options
| author | Christopher Wiley <wiley@google.com> | 2015-08-31 19:13:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-31 19:13:04 +0000 |
| commit | a73e004516bae61bebe1e308f5b3ee295c1050b2 (patch) | |
| tree | 1af579d299804fe15c7bd9e0a0f124eb45c61ed4 /tools/aidl | |
| parent | 1643e97b330d6c0f47e8643e52b12c6887a89f81 (diff) | |
| parent | ecaf21c3772befaac64f80bc3daeea0a29b59ddb (diff) | |
Merge "Revert "Tighten up compiler flags for aidl""
Diffstat (limited to 'tools/aidl')
| -rw-r--r-- | tools/aidl/Android.mk | 12 | ||||
| -rw-r--r-- | tools/aidl/aidl.cpp | 5 |
2 files changed, 6 insertions, 11 deletions
diff --git a/tools/aidl/Android.mk b/tools/aidl/Android.mk index 1f32f21b80d4..b8debf37f8f3 100644 --- a/tools/aidl/Android.mk +++ b/tools/aidl/Android.mk @@ -8,17 +8,6 @@ ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_CFLAGS := -g -Wall -Werror -# Tragically, the code is riddled with unused parameters. -LOCAL_CFLAGS += -Wno-unused-parameter -# yacc dumps a lot of code *just in case*. -LOCAL_CFLAGS += -Wno-unused-function -LOCAL_CFLAGS += -Wno-unneeded-internal-declaration -# yacc is a tool from a more civilized age. -LOCAL_CFLAGS += -Wno-deprecated-register -# yacc also has a habit of using char* over const char*. -LOCAL_CFLAGS += -Wno-writable-strings - LOCAL_SRC_FILES := \ AST.cpp \ Type.cpp \ @@ -33,6 +22,7 @@ LOCAL_SRC_FILES := \ options.cpp \ search_path.cpp \ +LOCAL_CFLAGS := -g LOCAL_MODULE := aidl include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp index d77f2b13dd97..a3cd12657f9a 100644 --- a/tools/aidl/aidl.cpp +++ b/tools/aidl/aidl.cpp @@ -165,6 +165,11 @@ import_import_parsed(buffer_type* statement) { } +static ParserCallbacks g_importCallbacks = { + &main_document_parsed, + &import_import_parsed +}; + // ========================================================== static int check_filename(const char* filename, const char* package, buffer_type* name) |