Merge "Revert "Tighten up compiler flags for aidl""

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)

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)