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

Commit 63b96e48 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Remove the simulator target from all makefiles. Bug: 5010576"

parents a5a0cea8 5e0067b4

camera/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -20,8 +20,4 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_MODULE:= libcamera_client



ifeq ($(TARGET_SIMULATOR),true)

    LOCAL_LDLIBS += -lpthread

endif



include $(BUILD_SHARED_LIBRARY)

drm/drmserver/Android.mk

+2 −7
Original line number Diff line number Diff line
@@ -24,13 +24,8 @@ LOCAL_SRC_FILES:= \ 
LOCAL_SHARED_LIBRARIES := \

    libmedia \

    libutils \

    libbinder



ifeq ($(TARGET_SIMULATOR),true)

 LOCAL_LDLIBS += -ldl

else

 LOCAL_SHARED_LIBRARIES += libdl

endif

    libbinder \

    libdl



LOCAL_STATIC_LIBRARIES := libdrmframeworkcommon

drm/libdrmframework/Android.mk

+2 −7
Original line number Diff line number Diff line
@@ -25,13 +25,8 @@ LOCAL_MODULE:= libdrmframework 


LOCAL_SHARED_LIBRARIES := \

    libutils \

    libbinder



ifeq ($(TARGET_SIMULATOR),true)

 LOCAL_LDLIBS += -ldl

else

 LOCAL_SHARED_LIBRARIES += libdl

endif

    libbinder \

    libdl



LOCAL_STATIC_LIBRARIES := \

    libdrmframeworkcommon

drm/libdrmframework/plugins/passthru/Android.mk

+2 −8
Original line number Diff line number Diff line
@@ -24,14 +24,8 @@ LOCAL_MODULE := libdrmpassthruplugin 
LOCAL_STATIC_LIBRARIES := libdrmframeworkcommon



LOCAL_SHARED_LIBRARIES := \

    libutils



ifeq ($(TARGET_SIMULATOR),true)

 LOCAL_LDLIBS += -ldl

else

 LOCAL_SHARED_LIBRARIES += libdl

endif



    libutils \

    libdl





LOCAL_C_INCLUDES += \

media/libeffects/factory/Android.mk

+0 −8
Original line number Diff line number Diff line
@@ -12,14 +12,6 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)

LOCAL_MODULE:= libeffects



ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)

LOCAL_LDLIBS += -ldl

endif



ifneq ($(TARGET_SIMULATOR),true)

LOCAL_SHARED_LIBRARIES += libdl

endif



LOCAL_C_INCLUDES := \



include $(BUILD_SHARED_LIBRARY)