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

diff --cc tools/aidl/Android.mk
index 1f32f21,efd60a2..b8debf3
--- 1/tools/aidl/Android.mk
--- 2/tools/aidl/Android.mk
+++ b/tools/aidl/Android.mk
@@@ -8,31 -8,20 +8,21 @@@ ifeq ($(TARGET_BUILD_APPS)$(filter true
  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 \
 -      aidl.cpp \
 -      aidl_language.cpp \
 -      options.cpp \
 -      search_path.cpp \
 -      AST.cpp \
 -      Type.cpp \
 -      generate_java.cpp \
 -      generate_java_binder.cpp \
 -      generate_java_rpc.cpp
 +    AST.cpp \
 +    Type.cpp \
 +    aidl.cpp \
 +    aidl_language.cpp \
 +    aidl_language_l.l \
 +    aidl_language_y.y \
 +    generate_java.cpp \
 +    generate_java_binder.cpp \
 +    generate_java_rpc.cpp \
 +    main.cpp \
 +    options.cpp \
 +    search_path.cpp \
  
+ LOCAL_CFLAGS := -g
  LOCAL_MODULE := aidl
  
  include $(BUILD_HOST_EXECUTABLE)

diff --cc tools/aidl/aidl.cpp
Simple merge