Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christopher Wiley
2015-08-31 19:13:04 +00:00
committed by Gerrit Code Review
parent 1643e97b33 ecaf21c377
commit a73e004516
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/aidl/Android.mk
View File

@@ -8,17 +8,6 @@ ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),)
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) 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 := \ LOCAL_SRC_FILES := \
AST.cpp \ AST.cpp \
Type.cpp \ Type.cpp \
@@ -33,6 +22,7 @@ LOCAL_SRC_FILES := \
options.cpp \ options.cpp \
search_path.cpp \ search_path.cpp \
LOCAL_CFLAGS := -g
LOCAL_MODULE := aidl LOCAL_MODULE := aidl
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)

5
tools/aidl/aidl.cpp
View File

@@ -165,6 +165,11 @@ import_import_parsed(buffer_type* statement)
{ {
} }
static ParserCallbacks g_importCallbacks = {
&main_document_parsed,
&import_import_parsed
};
// ========================================================== // ==========================================================
static int static int
check_filename(const char* filename, const char* package, buffer_type* name) check_filename(const char* filename, const char* package, buffer_type* name)