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

Commit 4f168c7c authored by Dmitriy Ivanov's avatar Dmitriy Ivanov Committed by Android Git Automerger
Browse files

am 78c95811: Merge "Remove checks for TARGET_SIMULATOR" 

* commit '78c95811':
  Remove checks for TARGET_SIMULATOR
parents 1d3b7639 78c95811

legacy/alsa_sound/Android.mk

+2 −10
Original line number Diff line number Diff line
@@ -45,11 +45,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libpower    \

    libalsa-intf



ifeq ($(TARGET_SIMULATOR),true)

 LOCAL_LDLIBS += -ldl

else

LOCAL_SHARED_LIBRARIES += libdl

endif



LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa

LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/libalsa-intf
@@ -128,11 +124,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    liblog    \

    libalsa-intf



ifeq ($(TARGET_SIMULATOR),true)

 LOCAL_LDLIBS += -ldl

else

LOCAL_SHARED_LIBRARIES += libdl

endif



LOCAL_MODULE:= alsa.msm8960

LOCAL_MODULE_TAGS := optional

legacy/libalsa-intf/Android.mk

+1 −5
Original line number Diff line number Diff line
@@ -44,11 +44,7 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_SHARED_LIBRARIES:= libc libcutils #libutils #libmedia libhardware_legacy

LOCAL_CFLAGS := -DQC_PROP -DCONFIG_DIR=\"/system/etc/snd_soc_msm/\"



ifeq ($(TARGET_SIMULATOR),true)

 LOCAL_LDLIBS += -ldl

else

LOCAL_SHARED_LIBRARIES += libdl

endif

LOCAL_PRELINK_MODULE := false

include $(BUILD_SHARED_LIBRARY)

endif