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

Commit 0c328734 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Use -Werror in frameworks/native/cmds" am: ea6c6b9f 

am: f27645c9

Change-Id: I3f79d715c5eaa08b0d4e139fdb056efb24ad3d15
parents 741bcf3b f27645c9

cmds/flatland/Android.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,8 @@ LOCAL_SRC_FILES:= \ 
    Renderers.cpp   \

    Renderers.cpp   \

    Main.cpp        \

    Main.cpp        \





LOCAL_CFLAGS := -Wall -Werror



LOCAL_MODULE:= flatland

LOCAL_MODULE:= flatland





LOCAL_MODULE_TAGS := tests

LOCAL_MODULE_TAGS := tests

cmds/flatland/Main.cpp

+0 −5
Original line number Original line Diff line number Diff line
@@ -284,7 +284,6 @@ class Layer { 
public:

public:





    Layer() :

    Layer() :

        mFirstFrame(true),

        mGLHelper(NULL),

        mGLHelper(NULL),

        mSurface(EGL_NO_SURFACE) {

        mSurface(EGL_NO_SURFACE) {

    }

    }
@@ -358,8 +357,6 @@ public: 
    }

    }





private:

private:

    bool mFirstFrame;



    LayerDesc mDesc;

    LayerDesc mDesc;





    GLHelper* mGLHelper;

    GLHelper* mGLHelper;
@@ -389,7 +386,6 @@ public: 
        ATRACE_CALL();

        ATRACE_CALL();





        bool result;

        bool result;

        EGLint resulte;





        float scaleFactor = float(mDesc.runHeights[mInstance]) /

        float scaleFactor = float(mDesc.runHeights[mInstance]) /

            float(mDesc.height);

            float(mDesc.height);
@@ -465,7 +461,6 @@ public: 
        ATRACE_CALL();

        ATRACE_CALL();





        bool result;

        bool result;

        status_t err;





        resetColorGenerator();

        resetColorGenerator();

cmds/ip-up-vpn/Android.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ LOCAL_PATH := $(call my-dir) 
include $(CLEAR_VARS)

include $(CLEAR_VARS)





LOCAL_SRC_FILES := ip-up-vpn.c

LOCAL_SRC_FILES := ip-up-vpn.c

LOCAL_CFLAGS := -Wall -Werror

LOCAL_SHARED_LIBRARIES := libcutils liblog

LOCAL_SHARED_LIBRARIES := libcutils liblog

LOCAL_MODULE := ip-up-vpn

LOCAL_MODULE := ip-up-vpn

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/ppp

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/ppp

cmds/rawbu/Android.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,8 @@ include $(CLEAR_VARS) 




LOCAL_SRC_FILES:= backup.cpp

LOCAL_SRC_FILES:= backup.cpp





LOCAL_CFLAGS := -Wall -Werror



LOCAL_SHARED_LIBRARIES := libcutils libc

LOCAL_SHARED_LIBRARIES := libcutils libc





LOCAL_MODULE:= rawbu

LOCAL_MODULE:= rawbu

cmds/rawbu/backup.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -129,7 +129,6 @@ static int wipe (const char *path) 
        }

        }





        if(S_ISDIR(statBuffer.st_mode)) {

        if(S_ISDIR(statBuffer.st_mode)) {

            int i;

            char *newpath;

            char *newpath;





            newpath = strdup(nameBuffer);

            newpath = strdup(nameBuffer);