diff options
| author | 2015-08-31 19:07:40 +0000 | |
|---|---|---|
| committer | 2015-08-31 19:07:40 +0000 | |
| commit | ecaf21c3772befaac64f80bc3daeea0a29b59ddb (patch) | |
| tree | 1573527fc45b03acf1dae8c0980049633ae50a17 | |
| parent | eea2353a3427f7d157c46e24ab6aba1378e16c2e (diff) | |
Revert "Tighten up compiler flags for aidl"
This reverts commit eea2353a3427f7d157c46e24ab6aba1378e16c2e.
This seems to have broken the build because whatever compiler the builder is using doesn't understand the same "turn off this warning" flags as my local host's compiler.
Change-Id: Ic68b7065b161a5ae683b7082c67147835833e0fa
| -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 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) |