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

Commit 3092f981 authored by Martijn Coenen's avatar Martijn Coenen
Browse files

resolve merge conflicts of 32ba3eaa to oc-mr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I731eba80656edbf87a5d5ba3af63a2c607ac61a6
Merged-In: Id71e2348eabf5101d1fd286bbc0076154703d159
parents a9a2b287 32ba3eaa

configstore/1.0/default/Android.mk

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



LOCAL_SHARED_LIBRARIES := \

    android.hardware.configstore@1.0 \

    libhidlbase \

    libhidltransport \

    libbase \

    libhwminijail \

    liblog \

    libutils \

    android.hardware.configstore@1.0 \



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)