diff options
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | msm8084/common.mk | 2 | ||||
| -rw-r--r-- | msm8084/libgralloc/alloc_controller.cpp | 1 | ||||
| -rw-r--r-- | msm8084/libgralloc/ionalloc.cpp | 1 | ||||
| -rw-r--r-- | msm8084/libqdutils/comptype.h | 1 | ||||
| -rw-r--r-- | msm8084/libqdutils/mdp_version.cpp | 1 |
6 files changed, 9 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 6ff7ecff1..e1dc136c9 100644 --- a/Android.mk +++ b/Android.mk @@ -1,3 +1,5 @@ +ifeq ($(call my-dir)/$(TARGET_BOARD_PLATFORM),$(call project-path-for,qcom-display)) + LOCAL_PATH := $(call my-dir) # TODO: Find a better way to separate build configs for ADP vs non-ADP devices ifneq ($(TARGET_BOARD_AUTO),true) @@ -19,3 +21,5 @@ else ifneq ($(wildcard $(LOCAL_PATH)/$(TARGET_BOARD_PLATFORM)),) endif endif + +endif diff --git a/msm8084/common.mk b/msm8084/common.mk index 388596a6d..0df38654b 100644 --- a/msm8084/common.mk +++ b/msm8084/common.mk @@ -21,7 +21,7 @@ common_libs := liblog libutils libcutils libhardware #Common C flags common_flags := -DDEBUG_CALC_FPS -Wno-missing-field-initializers #TODO: Add -Werror back once all the current warnings are fixed -common_flags += -Wconversion -Wall +common_flags += -Wno-error -Wno-sign-compare -Wno-sign-conversion -Wno-float-conversion ifeq ($(ARCH_ARM_HAVE_NEON),true) common_flags += -D__ARM_HAVE_NEON diff --git a/msm8084/libgralloc/alloc_controller.cpp b/msm8084/libgralloc/alloc_controller.cpp index c0069da59..16e9ec4e1 100644 --- a/msm8084/libgralloc/alloc_controller.cpp +++ b/msm8084/libgralloc/alloc_controller.cpp @@ -30,6 +30,7 @@ #include <cutils/log.h> #include <fcntl.h> #include <dlfcn.h> +#include <string.h> #include "gralloc_priv.h" #include "alloc_controller.h" #include "memalloc.h" diff --git a/msm8084/libgralloc/ionalloc.cpp b/msm8084/libgralloc/ionalloc.cpp index 3acf06eaa..781b59d4f 100644 --- a/msm8084/libgralloc/ionalloc.cpp +++ b/msm8084/libgralloc/ionalloc.cpp @@ -31,6 +31,7 @@ #include <sys/ioctl.h> #include <sys/mman.h> #include <stdlib.h> +#include <string.h> #include <fcntl.h> #include <cutils/log.h> #include <errno.h> diff --git a/msm8084/libqdutils/comptype.h b/msm8084/libqdutils/comptype.h index 71f487161..bbadaae30 100644 --- a/msm8084/libqdutils/comptype.h +++ b/msm8084/libqdutils/comptype.h @@ -31,6 +31,7 @@ #define INCLUDE_LIBQCOM_COMPTYPES #include <stdint.h> +#include <string.h> #include <utils/Singleton.h> #include <cutils/properties.h> diff --git a/msm8084/libqdutils/mdp_version.cpp b/msm8084/libqdutils/mdp_version.cpp index dcf8af728..ed80a519c 100644 --- a/msm8084/libqdutils/mdp_version.cpp +++ b/msm8084/libqdutils/mdp_version.cpp @@ -27,6 +27,7 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include <cutils/log.h> +#include <string.h> #include <linux/msm_mdp.h> #include "mdp_version.h" |