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

Merge "Frameworks/base: Wall Werror in rs"

Browse Source
This commit is contained in:
Andreas Gampe
2014-11-11 23:47:24 +00:00
committed by Gerrit Code Review
parent 8aa93764ea 67333928bf
commit 316e75fee6
2 changed files with 358 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rs/jni/Android.mk
View File

@@ -5,27 +5,28 @@ LOCAL_SRC_FILES:= \
android_renderscript_RenderScript.cpp android_renderscript_RenderScript.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libandroid_runtime \ libandroid_runtime \
libandroidfw \ libandroidfw \
libnativehelper \ libnativehelper \
libRS \ libRS \
libcutils \ libcutils \
liblog \ liblog \
libskia \ libskia \
libutils \ libutils \
libui \ libui \
libgui libgui
LOCAL_STATIC_LIBRARIES := LOCAL_STATIC_LIBRARIES :=
rs_generated_include_dir := $(call intermediates-dir-for,SHARED_LIBRARIES,libRS,,) rs_generated_include_dir := $(call intermediates-dir-for,SHARED_LIBRARIES,libRS,,)
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE) \ $(JNI_H_INCLUDE) \
frameworks/rs \ frameworks/rs \
$(rs_generated_include_dir) $(rs_generated_include_dir)
LOCAL_CFLAGS += -Wno-unused-parameter -std=c++11 LOCAL_CFLAGS += -Wno-unused-parameter -std=c++11
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
LOCAL_ADDITIONAL_DEPENDENCIES := $(addprefix $(rs_generated_include_dir)/,rsgApiFuncDecl.h) LOCAL_ADDITIONAL_DEPENDENCIES := $(addprefix $(rs_generated_include_dir)/,rsgApiFuncDecl.h)
LOCAL_MODULE:= librs_jni LOCAL_MODULE:= librs_jni

475
rs/jni/android_renderscript_RenderScript.cpp
View File

File diff suppressed because it is too large Load Diff