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

Commit b796529a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix library loading order in .mk files."

parents 1338e22d cf426f0f

configstore/1.1/default/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ LOCAL_SRC_FILES:= service.cpp 
include $(LOCAL_PATH)/surfaceflinger.mk



LOCAL_SHARED_LIBRARIES := \

    android.hardware.configstore@1.0 \

    android.hardware.configstore@1.1 \

    libhidlbase \

    libhidltransport \

    libbase \

    liblog \

    libutils \

    android.hardware.configstore@1.0 \

    android.hardware.configstore@1.1



include $(BUILD_EXECUTABLE)

wifi/1.1/default/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ LOCAL_SRC_FILES := \ 
    wifi_sta_iface.cpp \

    wifi_status_util.cpp

LOCAL_SHARED_LIBRARIES := \

    android.hardware.wifi@1.0 \

    android.hardware.wifi@1.1 \

    libbase \

    libcutils \

    libhidlbase \
@@ -47,6 +45,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libnl \

    libutils \

    libwifi-hal \

    libwifi-system-iface

    libwifi-system-iface \

    android.hardware.wifi@1.0 \

    android.hardware.wifi@1.1

LOCAL_INIT_RC := android.hardware.wifi@1.0-service.rc

include $(BUILD_EXECUTABLE)