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

Commit 8c55a9a5 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 067b873f bd882b1c
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -5,13 +5,6 @@ LOCAL_SRC_FILES:= \
	bootanimation_main.cpp \
	BootAnimation.cpp

# need "-lrt" on Linux simulator to pick up clock_gettime
ifeq ($(TARGET_SIMULATOR),true)
	ifeq ($(HOST_OS),linux)
		LOCAL_LDLIBS += -lrt
	endif
endif

LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES

LOCAL_SHARED_LIBRARIES := \
+0 −4
Original line number Diff line number Diff line
ifneq ($(TARGET_SIMULATOR),true)

LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

@@ -10,5 +8,3 @@ LOCAL_MODULE:= bugreport
LOCAL_SHARED_LIBRARIES := libcutils

include $(BUILD_EXECUTABLE)

endif
+0 −4
Original line number Diff line number Diff line
ifneq ($(TARGET_SIMULATOR),true)

LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

@@ -14,5 +12,3 @@ LOCAL_MODULE := dumpstate
LOCAL_SHARED_LIBRARIES := libcutils

include $(BUILD_EXECUTABLE)

endif
+0 −4
Original line number Diff line number Diff line
ifneq ($(TARGET_SIMULATOR),true)

LOCAL_PATH := $(call my-dir)

common_src_files := \
@@ -41,5 +39,3 @@ LOCAL_MODULE := installd
LOCAL_MODULE_TAGS := optional

include $(BUILD_EXECUTABLE)

endif # !simulator
+0 −4
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

ifneq ($(TARGET_SIMULATOR),true)

# Build the unit tests.
test_src_files := \
    installd_utils_test.cpp
@@ -38,5 +36,3 @@ $(foreach file,$(test_src_files), \
    $(eval LOCAL_MODULE_TAGS := $(module_tags)) \
    $(eval include $(BUILD_EXECUTABLE)) \
)

endif
Loading