am a73e0045: Merge "Revert "Tighten up compiler flags for aidl""
* commit 'a73e004516bae61bebe1e308f5b3ee295c1050b2':
Revert "Tighten up compiler flags for aidl"
diff --git a/tools/aidl/Android.mk b/tools/aidl/Android.mk
index 1f32f21..b8debf3 100644
--- a/tools/aidl/Android.mk
+++ b/tools/aidl/Android.mk
@@ -8,17 +8,6 @@
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 @@
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 a4ecb75..0ef4e27 100644
--- a/tools/aidl/aidl.cpp
+++ b/tools/aidl/aidl.cpp
@@ -162,6 +162,11 @@
{
}
+static ParserCallbacks g_importCallbacks = {
+ &main_document_parsed,
+ &import_import_parsed
+};
+
// ==========================================================
static int
check_filename(const char* filename, const char* package, buffer_type* name)