| commit | cbe986504337b957ca3b2f8befd9a1eae354a117 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue May 02 19:18:33 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 02 19:18:33 2017 +0000 |
| tree | 36f9216ba9a0e010514dc8aba090b2546039a221 | |
| parent | 9a4edfb40b6855cf121457edada013afd60b909a [diff] | |
| parent | aee42f01dc189c9509aaa284167b49e3d86a726d [diff] |
Merge "Vehicle: IWYU" into oc-dev-plus-aosp
diff --git a/automotive/vehicle/2.0/default/Android.mk b/automotive/vehicle/2.0/default/Android.mk index 3c56159..d5f5678 100644 --- a/automotive/vehicle/2.0/default/Android.mk +++ b/automotive/vehicle/2.0/default/Android.mk
@@ -122,6 +122,9 @@ tests/VehicleObjectPool_test.cpp \ tests/VehiclePropConfigIndex_test.cpp \ +LOCAL_HEADER_LIBRARIES := \ + libbase_headers + LOCAL_SHARED_LIBRARIES := \ libhidlbase \ libhidltransport \
diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp b/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp index ea40cc5..fe34a3f 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedVehicleHal.cpp
@@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #define LOG_TAG "DefaultVehicleHal_v2_0" + #include <android/log.h> +#include <android-base/macros.h> #include "EmulatedVehicleHal.h"
diff --git a/automotive/vehicle/2.0/default/tests/VehicleHalManager_test.cpp b/automotive/vehicle/2.0/default/tests/VehicleHalManager_test.cpp index 04335b5..4864d5d 100644 --- a/automotive/vehicle/2.0/default/tests/VehicleHalManager_test.cpp +++ b/automotive/vehicle/2.0/default/tests/VehicleHalManager_test.cpp
@@ -17,6 +17,7 @@ #include <unordered_map> #include <iostream> +#include <android-base/macros.h> #include <utils/SystemClock.h> #include <gtest/gtest.h>