Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ead989c3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "libbinder: Tighten compiler warnings/errors"

parents 6e81c9a4 3652ff46

libs/binder/Android.mk

+9 −13
Original line number Diff line number Diff line
@@ -42,20 +42,21 @@ sources := \ 


LOCAL_PATH:= $(call my-dir)



binder_cflags := -Wall -Wextra -Werror

ifneq ($(TARGET_USES_64_BIT_BINDER),true)

ifneq ($(TARGET_IS_64_BIT),true)

binder_cflags += -DBINDER_IPC_32BIT=1

endif

endif



include $(CLEAR_VARS)

LOCAL_MODULE := libbinder

LOCAL_SHARED_LIBRARIES := libbase liblog libcutils libutils

LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbase libutils



LOCAL_CLANG := true

LOCAL_SANITIZE := integer

LOCAL_SRC_FILES := $(sources)

ifneq ($(TARGET_USES_64_BIT_BINDER),true)

ifneq ($(TARGET_IS_64_BIT),true)

LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1

endif

endif

LOCAL_CFLAGS += -Werror

LOCAL_CFLAGS := $(binder_cflags)

include $(BUILD_SHARED_LIBRARY)



include $(CLEAR_VARS)
@@ -63,10 +64,5 @@ LOCAL_MODULE := libbinder 
LOCAL_STATIC_LIBRARIES := libbase libutils

LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := libbase libutils

LOCAL_SRC_FILES := $(sources)

ifneq ($(TARGET_USES_64_BIT_BINDER),true)

ifneq ($(TARGET_IS_64_BIT),true)

LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1

endif

endif

LOCAL_CFLAGS += -Werror

LOCAL_CFLAGS := $(binder_cflags)

include $(BUILD_STATIC_LIBRARY)

libs/binder/PersistableBundle.cpp

+0 −1
Original line number Diff line number Diff line
@@ -420,7 +420,6 @@ status_t PersistableBundle::readFromParcelInner(const Parcel* parcel, size_t len 
    RETURN_IF_FAILED(parcel->readInt32(&num_entries));



    for (; num_entries > 0; --num_entries) {

        size_t start_pos = parcel->dataPosition();

        String16 key;

        int32_t value_type;

        RETURN_IF_FAILED(parcel->readString16(&key));