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

Commit 80e46e08 authored by Tao Bao's avatar Tao Bao
Browse files

recovery: Switch to clang 

And a few trival fixes to suppress warnings.

Change-Id: I38734b5f4434643e85feab25f4807b46a45d8d65
parent 227069d7

Android.mk

+4 −2
Original line number Diff line number Diff line
@@ -14,11 +14,10 @@ 


LOCAL_PATH := $(call my-dir)





include $(CLEAR_VARS)



LOCAL_SRC_FILES := fuse_sideload.c



LOCAL_CLANG := true

LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter

LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
@@ -54,6 +53,7 @@ RECOVERY_API_VERSION := 3 
RECOVERY_FSTAB_VERSION := 2

LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)

LOCAL_CFLAGS += -Wno-unused-parameter

LOCAL_CLANG := true



LOCAL_C_INCLUDES += \

    system/vold \
@@ -97,6 +97,7 @@ include $(BUILD_EXECUTABLE) 


# All the APIs for testing

include $(CLEAR_VARS)

LOCAL_CLANG := true

LOCAL_MODULE := libverifier

LOCAL_MODULE_TAGS := tests

LOCAL_SRC_FILES := \
@@ -104,6 +105,7 @@ LOCAL_SRC_FILES := \ 
include $(BUILD_STATIC_LIBRARY)



include $(CLEAR_VARS)

LOCAL_CLANG := true

LOCAL_MODULE := verifier_test

LOCAL_FORCE_STATIC_EXECUTABLE := true

LOCAL_MODULE_TAGS := tests

adb_install.cpp

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ apply_from_adb(RecoveryUI* ui_, bool* wipe_cache, const char* install_file) { 
    // FUSE_SIDELOAD_HOST_PATHNAME will start to exist once the host

    // connects and starts serving a package.  Poll for its

    // appearance.  (Note that inotify doesn't work with FUSE.)

    int result;

    int result = INSTALL_ERROR;

    int status;

    bool waited = false;

    struct stat st;

applypatch/Android.mk

+5 −0
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ 
# limitations under the License.



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)



LOCAL_CLANG := true

LOCAL_SRC_FILES := applypatch.c bspatch.c freecache.c imgpatch.c utils.c

LOCAL_MODULE := libapplypatch

LOCAL_MODULE_TAGS := eng
@@ -25,6 +27,7 @@ include $(BUILD_STATIC_LIBRARY) 


include $(CLEAR_VARS)



LOCAL_CLANG := true

LOCAL_SRC_FILES := main.c

LOCAL_MODULE := applypatch

LOCAL_C_INCLUDES += bootable/recovery
@@ -35,6 +38,7 @@ include $(BUILD_EXECUTABLE) 


include $(CLEAR_VARS)



LOCAL_CLANG := true

LOCAL_SRC_FILES := main.c

LOCAL_MODULE := applypatch_static

LOCAL_FORCE_STATIC_EXECUTABLE := true
@@ -47,6 +51,7 @@ include $(BUILD_EXECUTABLE) 


include $(CLEAR_VARS)



LOCAL_CLANG := true

LOCAL_SRC_FILES := imgdiff.c utils.c bsdiff.c

LOCAL_MODULE := imgdiff

LOCAL_FORCE_STATIC_EXECUTABLE := true

edify/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ LOCAL_CFLAGS := $(edify_cflags) -g -O0 
LOCAL_MODULE := edify

LOCAL_YACCFLAGS := -v

LOCAL_CFLAGS += -Wno-unused-parameter

LOCAL_CLANG := true



include $(BUILD_HOST_EXECUTABLE)
@@ -38,5 +39,6 @@ LOCAL_SRC_FILES := $(edify_src_files) 
LOCAL_CFLAGS := $(edify_cflags)

LOCAL_CFLAGS += -Wno-unused-parameter

LOCAL_MODULE := libedify

LOCAL_CLANG := true



include $(BUILD_STATIC_LIBRARY)

minadbd/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ LOCAL_SRC_FILES := \ 
    fuse_adb_provider.cpp \

    services.cpp \



LOCAL_CLANG := true

LOCAL_MODULE := libminadbd

LOCAL_CFLAGS := $(minadbd_cflags)

LOCAL_CONLY_FLAGS := -Wimplicit-function-declaration