diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-12-07 14:24:43 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-12-08 09:27:26 +0100 |
| commit | e8d37d5d88fa24a66ea8467e9b87a665b5e56992 (patch) | |
| tree | 57345b9ec703cd08608f90ab7a63d3affc8da0af /emulator/opengl/googletest.mk | |
| parent | 6e909dbb16b137b08545df345c3fcffd262ffc7f (diff) | |
| download | sdk-e8d37d5d88fa24a66ea8467e9b87a665b5e56992.zip sdk-e8d37d5d88fa24a66ea8467e9b87a665b5e56992.tar.gz sdk-e8d37d5d88fa24a66ea8467e9b87a665b5e56992.tar.bz2 | |
emulator/opengl: Remove obsolete directory.
All sources were moved to external/qemu/distrib/android-emugl
to make it easier to modify both the emulator and host libraries
at the same time. See:
https://android-review.googlesource.com/#/c/118203/
As such, the sources in this directory are now ignored and can be
safely removed.
Change-Id: I5d143c971f995e2599e5e1d6174030d6803e8080
Diffstat (limited to 'emulator/opengl/googletest.mk')
| -rw-r--r-- | emulator/opengl/googletest.mk | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/emulator/opengl/googletest.mk b/emulator/opengl/googletest.mk deleted file mode 100644 index 7cc511d..0000000 --- a/emulator/opengl/googletest.mk +++ /dev/null @@ -1,50 +0,0 @@ -# This contains common definitions used to define a host module -# to link GoogleTest with the EmuGL test programs. -# -# This is used instead of including external/gtest/Android.mk to -# be able to build both the 32-bit and 64-bit binaries while -# building a 32-bit only SDK (sdk-eng, sdk_x86-eng, sdk_mips-eng). - - -ifeq (true,$(BUILD_STANDALONE_EMULATOR)) -LOCAL_PATH := $(EMULATOR_GTEST_SOURCES_DIR) -else -LOCAL_PATH := $(EMUGL_PATH)/../../../external/gtest -endif - -common_SRC_FILES := \ - src/gtest-all.cc \ - src/gtest_main.cc - -common_CFLAGS := -O0 - -ifneq (windows,$(HOST_OS)) - common_LDLIBS += -lpthread -endif - -$(call emugl-begin-host-static-library,libemugl_gtest) -LOCAL_SRC_FILES := $(common_SRC_FILES) -LOCAL_CFLAGS += $(common_CFLAGS) -LOCAL_CPP_EXTENSION := .cc -$(call emugl-export,C_INCLUDES,$(LOCAL_PATH)/include) -$(call emugl-export,LDLIBS,$(common_LDLIBS)) -$(call emugl-end-module) - -$(call emugl-begin-host64-static-library,lib64emugl_gtest) -LOCAL_SRC_FILES := $(common_SRC_FILES) -LOCAL_CFLAGS += $(common_CFLAGS) -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include -LOCAL_CPP_EXTENSION := .cc -$(call emugl-export,C_INCLUDES,$(LOCAL_PATH)/include) -$(call emugl-export,LDLIBS,$(common_LDLIBS)) -$(call emugl-end-module) - -$(call emugl-begin-host-static-library,libemugl_gtest_host) -LOCAL_SRC_FILES := $(common_SRC_FILES) -LOCAL_CFLAGS += $(common_CFLAGS) -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include -LOCAL_CPP_EXTENSION := .cc -$(call emugl-export,C_INCLUDES,$(LOCAL_PATH)/include) -$(call emugl-export,LDLIBS,$(common_LDLIBS) -lpthread) -LOCAL_HOST_BUILD := true -$(call emugl-end-module) |