From 503419ca75ccf10fcd200ece60f43a76ef3a0f1d Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Tue, 23 Aug 2011 13:00:45 +0200 Subject: [PATCH] Remove obsolete comments Change-Id: Ibaeca7f3cd17305dd4cac042d6020455c5675e2d --- .../emulator/opengl/system/GLESv1/Android.mk | 44 ----------- .../tests/gles_android_wrapper/Android.mk | 73 ------------------- .../tests/translator_tests/GLES_CM/Android.mk | 37 ---------- .../tests/translator_tests/GLES_V2/Android.mk | 37 ---------- .../translator_tests/MacCommon/Android.mk | 17 ----- 5 files changed, 208 deletions(-) diff --git a/tools/emulator/opengl/system/GLESv1/Android.mk b/tools/emulator/opengl/system/GLESv1/Android.mk index 9d45694d6..97356b710 100644 --- a/tools/emulator/opengl/system/GLESv1/Android.mk +++ b/tools/emulator/opengl/system/GLESv1/Android.mk @@ -10,47 +10,3 @@ LOCAL_SRC_FILES := gl.cpp LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl $(call emugl-end-module) - -# -# include $(CLEAR_VARS) -# -# # add additional depencies to ensure that the generated code that we depend on -# # is generated -# LOCAL_ADDITIONAL_DEPENDENCIES := \ -# $(TARGET_OUT_SHARED_LIBRARIES)/lib_renderControl_enc$(TARGET_SHLIB_SUFFIX) \ -# $(TARGET_OUT_SHARED_LIBRARIES)/libGLESv1_enc$(TARGET_SHLIB_SUFFIX) -# -# LOCAL_SRC_FILES := \ -# gl.cpp -# -# -# LOCAL_PRELINK_MODULE := false -# LOCAL_CFLAGS += -DLOG_TAG=\"GLES_emulation\" -DGL_GLEXT_PROTOTYPES -# LOCAL_C_INCLUDES += \ -# $(emulatorOpengl)/host/include/libOpenglRender \ -# $(emulatorOpengl)/shared/OpenglCodecCommon \ -# $(emulatorOpengl)/system/OpenglSystemCommon \ -# $(emulatorOpengl)/system/GLESv1_enc \ -# $(emulatorOpengl)/system/renderControl_enc \ -# $(call intermediates-dir-for, SHARED_LIBRARIES, lib_renderControl_enc) \ -# $(call intermediates-dir-for, SHARED_LIBRARIES, libGLESv1_enc) -# -# LOCAL_MODULE_TAGS := debug -# LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl -# LOCAL_MODULE := libGLESv1_CM_emulation -# LOCAL_MODULE_CLASS := SHARED_LIBRARIES -# -# -# LOCAL_STATIC_LIBRARIES := \ -# libOpenglCodecCommon \ -# -# LOCAL_SHARED_LIBRARIES := \ -# libcutils \ -# libutils \ -# libdl \ -# libOpenglSystemCommon \ -# libGLESv1_enc \ -# lib_renderControl_enc -# -# -# include $(BUILD_SHARED_LIBRARY) diff --git a/tools/emulator/opengl/tests/gles_android_wrapper/Android.mk b/tools/emulator/opengl/tests/gles_android_wrapper/Android.mk index 8aee20453..ddf885458 100644 --- a/tools/emulator/opengl/tests/gles_android_wrapper/Android.mk +++ b/tools/emulator/opengl/tests/gles_android_wrapper/Android.mk @@ -16,43 +16,6 @@ EMUGEN = $(BUILD_OUT_EXECUTABLES)/emugen ## comment for no debug #debugFlags = -g -O0 -#### libGLESv1_CM_emul.so -# include $(CLEAR_VARS) -# -# -# -# LOCAL_MODULE := libGLESv1_CM_emul -# LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl -# LOCAL_MODULE_CLASS := SHARED_LIBRARIES -# LOCAL_SRC_FILES := glesv1_emul_ifc.cpp -# -# LOCAL_PRELINK_MODULE := false -# LOCAL_MODULE_TAGS := debug -# LOCAL_SHARED_LIBRARIES := libdl libcutils -# LOCAL_CFLAGS += $(debugFlags) -# -# LOCAL_C_INCLUDES += \ -# $(emulatorOpengl)/system/GLESv1_enc \ -# $(emulatorOpengl)/shared/OpenglCodecCommon -# -# glesv1_emul_intermediates := $(local-intermediates-dir) -# -# GEN_GLESv1_emul := \ -# $(glesv1_emul_intermediates)/gl_wrapper_entry.cpp \ -# $(glesv1_emul_intermediates)/gl_wrapper_context.cpp -# $(GEN_GLESv1_emul) : PRIVATE_PATH := $(LOCAL_PATH) -# $(GEN_GLESv1_emul) : PRIVATE_CUSTOM_TOOL := \ -# $(EMUGEN) -W $(glesv1_emul_intermediates) -i $(emulatorOpengl)/system/GLESv1_enc gl -# $(GEN_GLESv1_emul) : $(EMUGEN) \ -# $(emulatorOpengl)/system/GLESv1_enc/gl.in \ -# $(emulatorOpengl)/system/GLESv1_enc/gl.attrib \ -# $(emulatorOpengl)/system/GLESv1_enc/gl.types -# $(transform-generated-source) -# -# LOCAL_GENERATED_SOURCES += $(GEN_GLESv1_emul) -# -# include $(BUILD_SHARED_LIBRARY) - #### libGLESv2_CM_emul.so $(call emugl-begin-shared-library, libGLESv2_emul) $(call emugl-import,libGLESv2_enc) @@ -61,42 +24,6 @@ LOCAL_SRC_FILES += glesv2_emul_ifc.cpp $(call emugl-set-shared-library-subpath,egl) $(call emugl-end-module) -# include $(CLEAR_VARS) -# -# LOCAL_MODULE := libGLESv2_emul -# LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl -# LOCAL_MODULE_CLASS := SHARED_LIBRARIES -# LOCAL_SRC_FILES := glesv2_emul_ifc.cpp -# -# LOCAL_PRELINK_MODULE := false -# LOCAL_MODULE_TAGS := debug -# LOCAL_SHARED_LIBRARIES := libdl libcutils -# LOCAL_CFLAGS += $(debugFlags) -# -# LOCAL_C_INCLUDES += \ -# $(emulatorOpengl)/system/GLESv2_enc \ -# $(emulatorOpengl)/shared/OpenglCodecCommon -# -# glesv2_emul_intermediates := $(local-intermediates-dir) -# -# GEN_GLESv2_emul := \ -# $(glesv2_emul_intermediates)/gl2_wrapper_entry.cpp \ -# $(glesv2_emul_intermediates)/gl2_wrapper_context.cpp -# -# $(GEN_GLESv2_emul) : PRIVATE_PATH := $(LOCAL_PATH) -# $(GEN_GLESv2_emul) : PRIVATE_CUSTOM_TOOL := \ -# $(EMUGEN) -W $(glesv2_emul_intermediates) -i $(emulatorOpengl)/system/GLESv2_enc gl2 -# $(GEN_GLESv2_emul) : $(EMUGEN) \ -# $(emulatorOpengl)/system/GLESv2_enc/gl2.in \ -# $(emulatorOpengl)/system/GLESv2_enc/gl2.attrib \ -# $(emulatorOpengl)/system/GLESv2_enc/gl2.types -# $(transform-generated-source) -# -# LOCAL_GENERATED_SOURCES += $(GEN_GLESv2_emul) -# -# include $(BUILD_SHARED_LIBRARY) - - ##### libEGL_emul.so ########### # THE FOLLOWING DOESN'T WORK YET diff --git a/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk b/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk index c1cda0a68..a72b778a8 100644 --- a/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk +++ b/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk @@ -21,40 +21,3 @@ $(call emugl-import,libMac_view) endif $(call emugl-end-module) - -# include $(CLEAR_VARS) -# -# translator_path := $(LOCAL_PATH)/../../../host/libs/Translator -# -# PREBUILT := $(HOST_PREBUILT_TAG) -# SDL_CONFIG ?= prebuilt/$(PREBUILT)/sdl/bin/sdl-config -# SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags) -# SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(SDL_CONFIG) --static-libs)) -# -# LOCAL_SRC_FILES:= \ -# triangleCM.cpp -# -# -# LOCAL_SHARED_LIBRARIES := \ -# libEGL_translator \ -# libGLES_CM_translator -# -# LOCAL_CFLAGS += $(SDL_CFLAGS) -g -O0 -# LOCAL_LDLIBS += $(SDL_LDLIBS) -# -# -# LOCAL_MODULE:= triangleCM -# LOCAL_MODULE_TAGS := debug -# LOCAL_STATIC_LIBRARIES += libSDL libSDLmain -# -# ifeq ($(HOST_OS),darwin) -# -# LOCAL_LDLIBS += -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit -# LOCAL_STATIC_LIBRARIES += libMac_view -# LOCAL_C_INCLUDES += \ -# $(LOCAL_PATH)/../MacCommon \ -# $(translator_path)/include -# endif -# -# include $(BUILD_HOST_EXECUTABLE) - diff --git a/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk b/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk index 8edea7ad5..ddbf98e33 100644 --- a/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk +++ b/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk @@ -22,40 +22,3 @@ endif $(call emugl-end-module) -# include $(CLEAR_VARS) -# -# translator_path := $(LOCAL_PATH)/../../../host/libs/Translator -# -# PREBUILT := $(HOST_PREBUILT_TAG) -# SDL_CONFIG ?= prebuilt/$(PREBUILT)/sdl/bin/sdl-config -# SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags) -# SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(SDL_CONFIG) --static-libs)) -# -# LOCAL_SRC_FILES:= \ -# triangleV2.cpp -# -# -# LOCAL_SHARED_LIBRARIES := \ -# libEGL_translator \ -# libGLES_V2_translator -# -# LOCAL_CFLAGS += $(SDL_CFLAGS) -g -O0 -# LOCAL_LDLIBS += $(SDL_LDLIBS) -# -# -# LOCAL_MODULE:= triangleV2 -# LOCAL_MODULE_TAGS := debug -# LOCAL_STATIC_LIBRARIES += libSDL libSDLmain -# -# ifeq ($(HOST_OS),darwin) -# -# LOCAL_LDLIBS += -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit -# LOCAL_C_INCLUDES += \ -# $(translator_path)/include \ -# $(LOCAL_PATH)/../MacCommon -# LOCAL_STATIC_LIBRARIES += libMac_view -# -# endif -# -# include $(BUILD_HOST_EXECUTABLE) - diff --git a/tools/emulator/opengl/tests/translator_tests/MacCommon/Android.mk b/tools/emulator/opengl/tests/translator_tests/MacCommon/Android.mk index 6e849a108..4c4ae6b18 100644 --- a/tools/emulator/opengl/tests/translator_tests/MacCommon/Android.mk +++ b/tools/emulator/opengl/tests/translator_tests/MacCommon/Android.mk @@ -11,20 +11,3 @@ LOCAL_SRC_FILES := setup_gl.m LOCAL_CFLAGS += -g -O0 $(call emugl-end-module) endif # HOST_OS == darwin - -# include $(CLEAR_VARS) -# -# -# LOCAL_LDLIBS := -Wl,-framework,AppKit -# -# LOCAL_SRC_FILES := setup_gl.m -# -# -# -# LOCAL_CFLAGS := -g -O0 -# LOCAL_MODULE_TAGS := debug -# LOCAL_MODULE := libMac_view -# -# -# include $(BUILD_HOST_STATIC_LIBRARY) -# endif