| commit | 060e3c72b40ad1ebc14b25c08efab4001948632b | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 12 19:24:54 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 12 19:24:57 2017 +0000 |
| tree | 68723a02411e33684eafc1e190e9d85f817d8739 | |
| parent | 95c62992c0e58ffd430560f73b5a98a1306fc8f4 [diff] | |
| parent | 34464406237b21ccf1e9f6dd5e7b9037efe82f54 [diff] |
Merge "Eliminate redundant #includes and a missing one"
diff --git a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/RecurrentTimer.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/RecurrentTimer.h index be25adc..0ed8742 100644 --- a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/RecurrentTimer.h +++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/RecurrentTimer.h
@@ -26,6 +26,7 @@ #include <set> #include <thread> #include <unordered_map> +#include <vector> /** * This class allows to specify multiple time intervals to receive
diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.h index 009485d..c25e083 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.h +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.h
@@ -25,14 +25,11 @@ #include <utils/SystemClock.h> -#include "VehicleHalProto.pb.h" - #include <vhal_v2_0/RecurrentTimer.h> #include <vhal_v2_0/VehicleHal.h> #include "vhal_v2_0/VehiclePropertyStore.h" #include "DefaultConfig.h" -#include "VehicleHalProto.pb.h" #include "VehicleEmulator.h" #include "FakeValueGenerator.h"
diff --git a/automotive/vehicle/2.1/default/impl/vhal_v2_1/EmulatedVehicleHal.cpp b/automotive/vehicle/2.1/default/impl/vhal_v2_1/EmulatedVehicleHal.cpp index 1d19aa2..46e062b 100644 --- a/automotive/vehicle/2.1/default/impl/vhal_v2_1/EmulatedVehicleHal.cpp +++ b/automotive/vehicle/2.1/default/impl/vhal_v2_1/EmulatedVehicleHal.cpp
@@ -23,7 +23,6 @@ #include <algorithm> #include "EmulatedVehicleHal.h" -#include "VehicleHalProto.pb.h" #define DEBUG_SOCKET (33452)