| commit | 34464406237b21ccf1e9f6dd5e7b9037efe82f54 | [log] [tgz] |
|---|---|---|
| author | Scott Randolph <randolphs@google.com> | Thu May 11 17:41:08 2017 -0700 |
| committer | Scott Randolph <randolphs@google.com> | Thu May 11 17:43:14 2017 -0700 |
| tree | c54e96b70eeb25366f5c7feda61974652df74c62 | |
| parent | 4a1461eada2ca971ff6fa23a118591caa7fc41e0 [diff] |
Eliminate redundant #includes and a missing one Minor cleanup that fell out of a debugging effort. Test: Build and run vehicle hal on gordon peak Change-Id: I29bcb74f3eac96df303139b2717b06c8dfedb839
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)