summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/aidl/Android.mk12
-rw-r--r--tools/aidl/aidl.cpp5
2 files changed, 6 insertions, 11 deletions
diff --git a/tools/aidl/Android.mk b/tools/aidl/Android.mk
index 9554e4291d41..efd60a2cda99 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 := \
aidl_language_l.l \
aidl_language_y.y \
@@ -32,6 +21,7 @@ LOCAL_SRC_FILES := \
generate_java_binder.cpp \
generate_java_rpc.cpp
+LOCAL_CFLAGS := -g
LOCAL_MODULE := aidl
include $(BUILD_HOST_EXECUTABLE)
diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp
index 0df9f065381a..2d8f0acf8bb5 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)