diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-01-17 16:47:15 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-01-21 03:26:57 +0100 |
| commit | bf5b0bc2d53d82bc6ff62ceec2fdaa8b796aa130 (patch) | |
| tree | 5a144545e29d6894149f673b88e5fcaf647b3137 /emulator/opengl/Android.mk | |
| parent | 2cab9c9e9b9e8075b27ee466fc01e34392b9380b (diff) | |
| download | sdk-bf5b0bc2d53d82bc6ff62ceec2fdaa8b796aa130.zip sdk-bf5b0bc2d53d82bc6ff62ceec2fdaa8b796aa130.tar.gz sdk-bf5b0bc2d53d82bc6ff62ceec2fdaa8b796aa130.tar.bz2 | |
emulator/opengl: Refactor SmartPtr implementation.
This gets rid of two copies of SmartPtr.h and replaces them with
a single implementation under shared/emugl/common/smart_ptr.*
Note that this uses a new include path rooted at the shared/
directory for classes that are likely to be built both for
the host and the device (in case we back-port this to
device/generic/goldfish/opengl/ in the future).
+ Add a gtest-based set of unittests, after building, just
call 'emugl_common_host_unittests' to run it.
Note that this probably needs a 64-bit version as well,
will come later once I find a way to build GTest for 64-bits
without breaking the platform build :-)
Also note that this moves the class to the 'emugl' namespace,
in order to make the code easier to build out of the platform
tree, and embed it in other projects. More classes will be
transitioned / refactored in future patches.
AOSP_BUG=64806
Change-Id: Ieb326c5f3f002a21537b8a391a82ce2ef9925073
Diffstat (limited to 'emulator/opengl/Android.mk')
| -rw-r--r-- | emulator/opengl/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/emulator/opengl/Android.mk b/emulator/opengl/Android.mk index d0434fc..da29214 100644 --- a/emulator/opengl/Android.mk +++ b/emulator/opengl/Android.mk @@ -16,7 +16,9 @@ EMUGL_PATH := $(call my-dir) # This is always set to a module's LOCAL_C_INCLUDES # See the definition of emugl-begin-module in common.mk # -EMUGL_COMMON_INCLUDES := $(EMUGL_PATH)/host/include/libOpenglRender +EMUGL_COMMON_INCLUDES := \ + $(EMUGL_PATH)/host/include/libOpenglRender \ + $(EMUGL_PATH)/shared ifeq ($(BUILD_STANDALONE_EMULATOR),true) EMUGL_COMMON_INCLUDES := $(EMUGL_PATH)/host/libs/Translator/include @@ -57,6 +59,7 @@ include $(EMUGL_PATH)/common.mk # source files (see all emugl-gen-decoder/encoder in common.mk) # include $(EMUGL_PATH)/host/tools/emugen/Android.mk +include $(EMUGL_PATH)/shared/emugl/common/Android.mk include $(EMUGL_PATH)/shared/OpenglOsUtils/Android.mk include $(EMUGL_PATH)/shared/OpenglCodecCommon/Android.mk |