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

Commit cb9ee7fb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Fix build after ag/2001747 breakage."""

parents b8346d9d 48e4002b

automotive/vehicle/2.0/default/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    $(vhal_v2_0) \



LOCAL_STATIC_LIBRARIES := \

    libqemu_pipe \

    $(vhal_v2_0)-libproto-native \



LOCAL_CFLAGS += -Wall -Wextra -Werror
@@ -166,6 +167,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    $(vhal_v2_0)-manager-lib \

    $(vhal_v2_0)-default-impl-lib \

    $(vhal_v2_0)-libproto-native \

    libqemu_pipe \



LOCAL_CFLAGS += -Wall -Wextra -Werror

automotive/vehicle/2.0/default/impl/vhal_v2_0/PipeComm.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>

#include <android/log.h>

#include <system/qemu_pipe.h>

#include <qemu_pipe.h>



#include "PipeComm.h"

automotive/vehicle/2.1/default/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ 
LOCAL_STATIC_LIBRARIES := \

    $(vhal_v2_0)-default-impl-lib \

    $(vhal_v2_0)-manager-lib \

    libqemu_pipe \

    $(vhal_v2_1)-manager-lib \

    $(vhal_v2_0)-libproto-native
@@ -103,6 +104,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    $(vhal_v2_0)-manager-lib \

    $(vhal_v2_0)-default-impl-lib \

    $(vhal_v2_1)-default-impl-lib \

    libqemu_pipe \

    $(vhal_v2_1)-manager-lib \



LOCAL_SHARED_LIBRARIES := \