ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Brown 2011-07-12 12:15:07 -07:00 committed by Android (Google) Code Review
commit 7175398247
21 changed files with 36 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/keystore/Android.mk
View File

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
ifneq ($(TARGET_SIMULATOR),true)
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -32,5 +30,3 @@ LOCAL_SHARED_LIBRARIES := libcutils libcrypto
LOCAL_MODULE:= keystore_cli LOCAL_MODULE:= keystore_cli
LOCAL_MODULE_TAGS := debug LOCAL_MODULE_TAGS := debug
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
endif

4
libs/gui/Android.mk
View File

@ -32,10 +32,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE:= libgui LOCAL_MODULE:= libgui
ifeq ($(TARGET_SIMULATOR),true)
LOCAL_LDLIBS += -lpthread
endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
ifeq (,$(ONE_SHOT_MAKEFILE)) ifeq (,$(ONE_SHOT_MAKEFILE))

4
libs/gui/tests/Android.mk
View File

@ -2,8 +2,6 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
ifneq ($(TARGET_SIMULATOR),true)
LOCAL_MODULE := SurfaceTexture_test LOCAL_MODULE := SurfaceTexture_test
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
@ -36,8 +34,6 @@ LOCAL_C_INCLUDES := \
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
endif
# Include subdirectory makefiles # Include subdirectory makefiles
# ============================================================ # ============================================================

4
libs/surfaceflinger_client/Android.mk
View File

@ -7,8 +7,4 @@ LOCAL_SHARED_LIBRARIES :=
LOCAL_MODULE:= libsurfaceflinger_client LOCAL_MODULE:= libsurfaceflinger_client
ifeq ($(TARGET_SIMULATOR),true)
LOCAL_LDLIBS += -lpthread
endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

4
libs/ui/Android.mk
View File

@ -68,10 +68,6 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE:= libui LOCAL_MODULE:= libui
ifeq ($(TARGET_SIMULATOR),true)
LOCAL_LDLIBS += -lpthread
endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

4
libs/ui/tests/Android.mk
View File

@ -2,8 +2,6 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
ifneq ($(TARGET_SIMULATOR),true)
# Build the unit tests. # Build the unit tests.
test_src_files := \ test_src_files := \
InputChannel_test.cpp \ InputChannel_test.cpp \
@ -48,5 +46,3 @@ $(foreach file,$(test_src_files), \
# Build the manual test programs. # Build the manual test programs.
include $(call all-subdir-makefiles) include $(call all-subdir-makefiles)
endif

4
libs/utils/Android.mk
View File

@ -103,17 +103,14 @@ LOCAL_SHARED_LIBRARIES := \
liblog \ liblog \
libcutils libcutils
ifneq ($(TARGET_SIMULATOR),true)
ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86) ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86)
# This is needed on x86 to bring in dl_iterate_phdr for CallStack.cpp # This is needed on x86 to bring in dl_iterate_phdr for CallStack.cpp
LOCAL_SHARED_LIBRARIES += libdl LOCAL_SHARED_LIBRARIES += libdl
endif # linux-x86 endif # linux-x86
endif # sim
LOCAL_MODULE:= libutils LOCAL_MODULE:= libutils
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
ifneq ($(TARGET_SIMULATOR),true)
ifeq ($(TARGET_OS),linux) ifeq ($(TARGET_OS),linux)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_C_INCLUDES += external/zlib external/icu4c/common LOCAL_C_INCLUDES += external/zlib external/icu4c/common
@ -122,7 +119,6 @@ LOCAL_MODULE := libutils
LOCAL_SRC_FILES := $(commonSources) BackupData.cpp BackupHelpers.cpp LOCAL_SRC_FILES := $(commonSources) BackupData.cpp BackupHelpers.cpp
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
endif endif
endif
# Include subdirectory makefiles # Include subdirectory makefiles

4
libs/utils/tests/Android.mk
View File

@ -2,8 +2,6 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
ifneq ($(TARGET_SIMULATOR),true)
# Build the unit tests. # Build the unit tests.
test_src_files := \ test_src_files := \
BlobCache_test.cpp \ BlobCache_test.cpp \
@ -43,5 +41,3 @@ $(foreach file,$(test_src_files), \
$(eval LOCAL_MODULE_TAGS := $(module_tags)) \ $(eval LOCAL_MODULE_TAGS := $(module_tags)) \
$(eval include $(BUILD_EXECUTABLE)) \ $(eval include $(BUILD_EXECUTABLE)) \
) )
endif

2
opengl/libagl/Android.mk
View File

@ -38,7 +38,6 @@ ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif endif
ifneq ($(TARGET_SIMULATOR),true)
# we need to access the private Bionic header <bionic_tls.h> # we need to access the private Bionic header <bionic_tls.h>
# on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER # on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER
# behavior from the bionic Android.mk file # behavior from the bionic Android.mk file
@ -46,7 +45,6 @@ ifneq ($(TARGET_SIMULATOR),true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif endif
LOCAL_C_INCLUDES += bionic/libc/private LOCAL_C_INCLUDES += bionic/libc/private
endif
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
LOCAL_MODULE:= libGLES_android LOCAL_MODULE:= libGLES_android

2
opengl/libagl2/Android.mk
View File

@ -39,7 +39,6 @@ ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif endif
ifneq ($(TARGET_SIMULATOR),true)
# we need to access the private Bionic header <bionic_tls.h> # we need to access the private Bionic header <bionic_tls.h>
# on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER # on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER
# behavior from the bionic Android.mk file # behavior from the bionic Android.mk file
@ -47,7 +46,6 @@ ifneq ($(TARGET_SIMULATOR),true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif endif
LOCAL_C_INCLUDES += bionic/libc/private LOCAL_C_INCLUDES += bionic/libc/private
endif
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
#replace libagl for now #replace libagl for now

12
opengl/libs/Android.mk
View File

@ -21,9 +21,6 @@ LOCAL_SHARED_LIBRARIES += libcutils libutils libGLESv2_dbg
LOCAL_LDLIBS := -lpthread -ldl LOCAL_LDLIBS := -lpthread -ldl
LOCAL_MODULE:= libEGL LOCAL_MODULE:= libEGL
LOCAL_LDFLAGS += -Wl,--exclude-libs=ALL LOCAL_LDFLAGS += -Wl,--exclude-libs=ALL
# needed on sim build because of weird logging issues
ifeq ($(TARGET_SIMULATOR),true)
else
LOCAL_SHARED_LIBRARIES += libdl LOCAL_SHARED_LIBRARIES += libdl
# Bionic's private TLS header relies on the ARCH_ARM_HAVE_TLS_REGISTER to # Bionic's private TLS header relies on the ARCH_ARM_HAVE_TLS_REGISTER to
# select the appropriate TLS codepath # select the appropriate TLS codepath
@ -32,7 +29,6 @@ else
endif endif
# we need to access the private Bionic header <bionic_tls.h> # we need to access the private Bionic header <bionic_tls.h>
LOCAL_C_INCLUDES += bionic/libc/private LOCAL_C_INCLUDES += bionic/libc/private
endif
LOCAL_CFLAGS += -DLOG_TAG=\"libEGL\" LOCAL_CFLAGS += -DLOG_TAG=\"libEGL\"
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
@ -81,16 +77,12 @@ LOCAL_SHARED_LIBRARIES += libcutils libEGL
LOCAL_LDLIBS := -lpthread -ldl LOCAL_LDLIBS := -lpthread -ldl
LOCAL_MODULE:= libGLESv1_CM LOCAL_MODULE:= libGLESv1_CM
# needed on sim build because of weird logging issues
ifeq ($(TARGET_SIMULATOR),true)
else
LOCAL_SHARED_LIBRARIES += libdl LOCAL_SHARED_LIBRARIES += libdl
# we need to access the private Bionic header <bionic_tls.h> # we need to access the private Bionic header <bionic_tls.h>
ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true) ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif endif
LOCAL_C_INCLUDES += bionic/libc/private LOCAL_C_INCLUDES += bionic/libc/private
endif
LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv1\" LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv1\"
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
@ -117,16 +109,12 @@ LOCAL_SHARED_LIBRARIES += libcutils libEGL
LOCAL_LDLIBS := -lpthread -ldl LOCAL_LDLIBS := -lpthread -ldl
LOCAL_MODULE:= libGLESv2 LOCAL_MODULE:= libGLESv2
# needed on sim build because of weird logging issues
ifeq ($(TARGET_SIMULATOR),true)
else
LOCAL_SHARED_LIBRARIES += libdl LOCAL_SHARED_LIBRARIES += libdl
# we need to access the private Bionic header <bionic_tls.h> # we need to access the private Bionic header <bionic_tls.h>
ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true) ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif endif
LOCAL_C_INCLUDES += bionic/libc/private LOCAL_C_INCLUDES += bionic/libc/private
endif
LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv2\" LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv2\"
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES

2
opengl/libs/GLES2_dbg/Android.mk
View File

@ -31,7 +31,6 @@ ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif endif
ifneq ($(TARGET_SIMULATOR),true)
# we need to access the private Bionic header <bionic_tls.h> # we need to access the private Bionic header <bionic_tls.h>
# on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER # on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER
# behavior from the bionic Android.mk file # behavior from the bionic Android.mk file
@ -39,7 +38,6 @@ ifneq ($(TARGET_SIMULATOR),true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif endif
LOCAL_C_INCLUDES += bionic/libc/private LOCAL_C_INCLUDES += bionic/libc/private
endif
LOCAL_MODULE:= libGLESv2_dbg LOCAL_MODULE:= libGLESv2_dbg
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional

2
opengl/libs/GLES2_dbg/test/Android.mk
View File

@ -27,9 +27,7 @@ LOCAL_MODULE:= libGLESv2_dbg_test
ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true) ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif endif
ifneq ($(TARGET_SIMULATOR),true)
LOCAL_C_INCLUDES += bionic/libc/private LOCAL_C_INCLUDES += bionic/libc/private
endif
LOCAL_CFLAGS += -DLOG_TAG=\"libEGL\" LOCAL_CFLAGS += -DLOG_TAG=\"libEGL\"
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES

4
opengl/tests/EGLTest/Android.mk
View File

@ -2,8 +2,6 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
ifneq ($(TARGET_SIMULATOR),true)
LOCAL_MODULE := EGL_test LOCAL_MODULE := EGL_test
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
@ -29,8 +27,6 @@ LOCAL_C_INCLUDES := \
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
endif
# Include subdirectory makefiles # Include subdirectory makefiles
# ============================================================ # ============================================================

4
opengl/tests/gl2_jni/Android.mk
View File

@ -2,8 +2,6 @@
# OpenGL ES JNI sample # OpenGL ES JNI sample
# This makefile builds both an activity and a shared library. # This makefile builds both an activity and a shared library.
######################################################################### #########################################################################
ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean
TOP_LOCAL_PATH:= $(call my-dir) TOP_LOCAL_PATH:= $(call my-dir)
# Build activity # Build activity
@ -47,5 +45,3 @@ LOCAL_MODULE := libgl2jni
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
endif # TARGET_SIMULATOR

4
opengl/tests/gl_jni/Android.mk
View File

@ -2,8 +2,6 @@
# OpenGL ES JNI sample # OpenGL ES JNI sample
# This makefile builds both an activity and a shared library. # This makefile builds both an activity and a shared library.
######################################################################### #########################################################################
ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean
TOP_LOCAL_PATH:= $(call my-dir) TOP_LOCAL_PATH:= $(call my-dir)
# Build activity # Build activity
@ -49,5 +47,3 @@ LOCAL_ARM_MODE := arm
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
endif # TARGET_SIMULATOR

4
opengl/tests/gl_perfapp/Android.mk
View File

@ -2,8 +2,6 @@
# OpenGL ES Perf App # OpenGL ES Perf App
# This makefile builds both an activity and a shared library. # This makefile builds both an activity and a shared library.
######################################################################### #########################################################################
ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean
TOP_LOCAL_PATH:= $(call my-dir) TOP_LOCAL_PATH:= $(call my-dir)
# Build activity # Build activity
@ -50,5 +48,3 @@ LOCAL_MODULE := libglperf
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
endif # TARGET_SIMULATOR

4
opengl/tests/gldual/Android.mk
View File

@ -2,8 +2,6 @@
# OpenGL ES JNI sample # OpenGL ES JNI sample
# This makefile builds both an activity and a shared library. # This makefile builds both an activity and a shared library.
######################################################################### #########################################################################
ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean
TOP_LOCAL_PATH:= $(call my-dir) TOP_LOCAL_PATH:= $(call my-dir)
# Build activity # Build activity
@ -47,5 +45,3 @@ LOCAL_MODULE := libgldualjni
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
endif # TARGET_SIMULATOR

4
opengl/tests/testPauseResume/Android.mk
View File

@ -2,8 +2,6 @@
# OpenGL ES JNI sample # OpenGL ES JNI sample
# This makefile builds both an activity and a shared library. # This makefile builds both an activity and a shared library.
######################################################################### #########################################################################
ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean
TOP_LOCAL_PATH:= $(call my-dir) TOP_LOCAL_PATH:= $(call my-dir)
# Build activity # Build activity
@ -18,5 +16,3 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := TestEGL LOCAL_PACKAGE_NAME := TestEGL
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
endif # TARGET_SIMULATOR

4
opengl/tests/testViewport/Android.mk
View File

@ -2,8 +2,6 @@
# OpenGL ES JNI sample # OpenGL ES JNI sample
# This makefile builds both an activity and a shared library. # This makefile builds both an activity and a shared library.
######################################################################### #########################################################################
ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean
TOP_LOCAL_PATH:= $(call my-dir) TOP_LOCAL_PATH:= $(call my-dir)
# Build activity # Build activity
@ -22,5 +20,3 @@ LOCAL_PACKAGE_NAME := TestViewport
LOCAL_SDK_VERSION := 8 LOCAL_SDK_VERSION := 8
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
endif # TARGET_SIMULATOR

7
services/surfaceflinger/Android.mk
View File

@ -26,13 +26,6 @@ ifeq ($(TARGET_BOARD_PLATFORM), s5pc110)
endif endif
# need "-lrt" on Linux simulator to pick up clock_gettime
ifeq ($(TARGET_SIMULATOR),true)
ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -lrt -lpthread
endif
endif
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libhardware \ libhardware \