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

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

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

parents 95eece81 b6fa3ae6

configstore/1.1/default/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@ 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 \

    libhwminijail \

    liblog \

    libutils \

    android.hardware.configstore@1.0 \

    android.hardware.configstore@1.1



include $(BUILD_EXECUTABLE)

wifi/1.2/default/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -37,9 +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 \

    android.hardware.wifi@1.2 \

    libbase \

    libcutils \

    libhidlbase \
@@ -48,6 +45,9 @@ LOCAL_SHARED_LIBRARIES := \ 
    libnl \

    libutils \

    libwifi-hal \

    libwifi-system-iface

    libwifi-system-iface \

    android.hardware.wifi@1.0 \

    android.hardware.wifi@1.1 \

    android.hardware.wifi@1.2

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

include $(BUILD_EXECUTABLE)