diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-13 23:19:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-13 23:19:37 +0000 |
| commit | d09cf8f10f78ef3db2ab4824dc8374360dc7a860 (patch) | |
| tree | 90a6b7776b2ed657c5ec2135ef80a6aa6dae8209 /services | |
| parent | 4037c458a7594cb3cd81a14e7e974abc28180187 (diff) | |
| parent | 9c17fb191253e9bdc9fc73ba9ff2d590892e5061 (diff) | |
| download | frameworks_native-d09cf8f10f78ef3db2ab4824dc8374360dc7a860.zip frameworks_native-d09cf8f10f78ef3db2ab4824dc8374360dc7a860.tar.gz frameworks_native-d09cf8f10f78ef3db2ab4824dc8374360dc7a860.tar.bz2 | |
am 9c17fb19: Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"
* commit '9c17fb191253e9bdc9fc73ba9ff2d590892e5061':
Frameworks/native: Wall Werror in batteryservice & powermanager
Diffstat (limited to 'services')
| -rw-r--r-- | services/batteryservice/Android.mk | 14 | ||||
| -rw-r--r-- | services/batteryservice/IBatteryPropertiesListener.cpp | 2 | ||||
| -rw-r--r-- | services/powermanager/Android.mk | 8 |
3 files changed, 14 insertions, 10 deletions
diff --git a/services/batteryservice/Android.mk b/services/batteryservice/Android.mk index 9354b99..e4097d7 100644 --- a/services/batteryservice/Android.mk +++ b/services/batteryservice/Android.mk @@ -2,17 +2,19 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - BatteryProperties.cpp \ - BatteryProperty.cpp \ - IBatteryPropertiesListener.cpp \ - IBatteryPropertiesRegistrar.cpp + BatteryProperties.cpp \ + BatteryProperty.cpp \ + IBatteryPropertiesListener.cpp \ + IBatteryPropertiesRegistrar.cpp LOCAL_STATIC_LIBRARIES := \ - libutils \ - libbinder + libutils \ + libbinder LOCAL_MODULE:= libbatteryservice LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code + include $(BUILD_STATIC_LIBRARY) diff --git a/services/batteryservice/IBatteryPropertiesListener.cpp b/services/batteryservice/IBatteryPropertiesListener.cpp index 19ac7f0..8aff26c 100644 --- a/services/batteryservice/IBatteryPropertiesListener.cpp +++ b/services/batteryservice/IBatteryPropertiesListener.cpp @@ -35,7 +35,7 @@ public: data.writeInterfaceToken(IBatteryPropertiesListener::getInterfaceDescriptor()); data.writeInt32(1); props.writeToParcel(&data); - status_t err = remote()->transact(TRANSACT_BATTERYPROPERTIESCHANGED, data, &reply, IBinder::FLAG_ONEWAY); + remote()->transact(TRANSACT_BATTERYPROPERTIESCHANGED, data, &reply, IBinder::FLAG_ONEWAY); } }; diff --git a/services/powermanager/Android.mk b/services/powermanager/Android.mk index d98b2da..7b24c65 100644 --- a/services/powermanager/Android.mk +++ b/services/powermanager/Android.mk @@ -2,14 +2,16 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - IPowerManager.cpp + IPowerManager.cpp LOCAL_SHARED_LIBRARIES := \ - libutils \ - libbinder + libutils \ + libbinder LOCAL_MODULE:= libpowermanager LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code + include $(BUILD_SHARED_LIBRARY) |