aboutsummaryrefslogtreecommitdiffstats
path: root/emulator/opengl/common.mk
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2012-05-30 15:24:06 -0700
committerJesse Hall <jessehall@google.com>2012-06-06 09:39:32 -0700
commit3d1eacc2a657b024587bbf6f369f073c4daa36be (patch)
treeabba23f534e16ced6f64cd386c00328567db56eb /emulator/opengl/common.mk
parent455038d1740083aa5e2b5b0ec852cd81bcc9ce1e (diff)
downloadsdk-3d1eacc2a657b024587bbf6f369f073c4daa36be.zip
sdk-3d1eacc2a657b024587bbf6f369f073c4daa36be.tar.gz
sdk-3d1eacc2a657b024587bbf6f369f073c4daa36be.tar.bz2
Move emugl system code to development.git
Because of the way the SDK and Android system images are branched, host code that goes into the SDK tools can't live in the same repository as code that goes into the system image. This change keeps the emugl host code in sdk.git/emulator/opengl while moving the emugl system code to development.git/tools/emulator/opengl. A few changes were made beyond simply cloning the directories: (a) Makefiles were modified to only build the relevant components. Not doing so would break the build due to having multiple rule definitions. (b) Protocol spec files were moved from the guest encoder directories to the host decoder directories. The decoder must support older versions of the protocol, but not newer versions, so it makes sense to keep the latest version of the protocol spec with the decoder. (c) Along with that, the encoder is now built from checked in generated encoder source rather than directly from the protocol spec. The generated code must be updated manually. This makes it possible to freeze the system encoder version without freezing the host decoder version, and also makes it very obvious when a protocol changes is happening that will require special backwards-compatibility support in the decoder/renderer. (d) Host-only and system-only code were removed from the repository where they aren't used. (e) README and DESIGN documents were updated to reflect this split. No actual source code was changed due to the above. Change-Id: I70b576a70ac3dc94155f931508b152178f1e8cd5
Diffstat (limited to 'emulator/opengl/common.mk')
-rw-r--r--emulator/opengl/common.mk101
1 files changed, 0 insertions, 101 deletions
diff --git a/emulator/opengl/common.mk b/emulator/opengl/common.mk
index 82f652d..78b29ca 100644
--- a/emulator/opengl/common.mk
+++ b/emulator/opengl/common.mk
@@ -20,8 +20,6 @@
# LOCAL_C_INCLUDES += ....
# $(call emugl-end-module)
#
-emugl-begin-static-library = $(call emugl-begin-module,$1,STATIC_LIBRARY)
-emugl-begin-shared-library = $(call emugl-begin-module,$1,SHARED_LIBRARY)
emugl-begin-host-static-library = $(call emugl-begin-module,$1,HOST_STATIC_LIBRARY,HOST)
emugl-begin-host-shared-library = $(call emugl-begin-module,$1,HOST_SHARED_LIBRARY,HOST)
emugl-begin-host-executable = $(call emugl-begin-module,$1,HOST_EXECUTABLE,HOST)
@@ -198,34 +196,6 @@ emugl-gen-decoder = \
$(call emugl-gen-decoder-generic,$(_emugl_out),$1,$2)\
$(call emugl-export,C_INCLUDES,$(_emugl_out))
-# This function can be called to generate the encoder source files.
-# LOCAL_MODULE and LOCAL_MODULE_CLASS must be defined or the build will abort.
-# Source files will be stored in the local intermediates directory that will
-# be automatically added to your LOCAL_C_INCLUDES.
-# Usage:
-# $(call emugl-gen-encoder,<input-dir>,<basename>)
-#
-emugl-gen-encoder = \
- $(eval _emugl_out := $(call local-intermediates-dir)) \
- $(call emugl-gen-encoder-generic,$(_emugl_out),$1,$2) \
- $(call emugl-export,C_INCLUDES,$(_emugl_out))
-
-
-# This function can be called to generate the wrapper source files.
-# LOCAL_MODULE and LOCAL_MODULE_CLASS must be defined or the build will abort.
-# Source files will be stored in the local intermediates directory that will
-# be automatically added to your LOCAL_C_INCLUDES.
-# Usage:
-# $(call emugl-gen-wrapper,<input-dir>,<basename>)
-#
-emugl-gen-wrapper = \
- $(eval _emugl_out := $(call local-intermediates-dir)) \
- $(call emugl-gen-wrapper-generic,$(_emugl_out),$1,$2) \
- $(call emugl-export,C_INCLUDES,$(_emugl_out))
-
-# IMPORTANT: EMUGL_EMUGEN is defined under host/tools/emugen/Android.mk
-#
-
# DO NOT CALL DIRECTLY, USE emugl-gen-decoder instead.
#
# The following function can be called to generate wire protocol decoder
@@ -258,77 +228,6 @@ LOCAL_GENERATED_SOURCES += $$(GEN)
LOCAL_C_INCLUDES += $$1
endef
-# DO NOT CALL DIRECTLY, USE emugl-gen-encoder instead.
-#
-# The following function can be called to generate wire protocol encoder
-# source files, Usage is:
-#
-# $(call emugl-gen-encoder-generic,<dst-dir>,<src-dir>,<basename>)
-#
-# <dst-dir> is the destination directory where the generated sources are stored
-# <src-dir> is the source directory where to find <basename>.attrib, etc..
-# <basename> is the emugen basename (see host/tools/emugen/README)
-#
-emugl-gen-encoder-generic = $(eval $(emugl-gen-encoder-generic-ev))
-
-define emugl-gen-encoder-generic-ev
-_emugl_enc := $$1/$$3
-_emugl_src := $$2/$$3
-GEN := $$(_emugl_enc)_entry.cpp \
- $$(_emugl_enc)_enc.cpp \
- $$(_emugl_enc)_enc.h \
- $$(_emugl_enc)_ftable.h \
- $$(_emugl_enc)_opcodes.h \
- $$(_emugl_enc)_client_context.h \
- $$(_emugl_enc)_client_context.cpp
-
-$$(GEN): PRIVATE_PATH := $$(LOCAL_PATH)
-$$(GEN): PRIVATE_CUSTOM_TOOL := $$(EMUGL_EMUGEN) -E $$1 -i $$2 $$3
-$$(GEN): $$(EMUGL_EMUGEN) $$(_emugl_src).attrib $$(_emugl_src).in $$(_emugl_src).types
- $$(transform-generated-source)
-
-$$(call emugl-export,ADDITIONAL_DEPENDENCIES,$$(GEN))
-LOCAL_GENERATED_SOURCES += $$(GEN)
-LOCAL_C_INCLUDES += $$1
-endef
-
-
-# DO NOT CALL DIRECTLY, USE emugl-gen-wrapper instead.
-#
-# The following function can be called to generate GL library wrapper
-# Usage is:
-#
-# $(call emugl-gen-wrapper-generic,<dst-dir>,<src-dir>,<basename>)
-#
-# <dst-dir> is the destination directory where the generated sources are stored
-# <src-dir> is the source directory where to find <basename>.attrib, etc..
-# <basename> is the emugen basename (see host/tools/emugen/README)
-#
-emugl-gen-wrapper-generic = $(eval $(emugl-gen-wrapper-generic-ev))
-
-define emugl-gen-wrapper-generic-ev
-_emugl_wrap := $$1/$$3
-_emugl_src := $$2/$$3
-GEN := $$(_emugl_wrap)_wrapper_entry.cpp \
- $$(_emugl_wrap)_wrapper_context.cpp \
- $$(_emugl_wrap)_wrapper_context.h \
- $$(_emugl_wrap)_wrapper_proc.h
-
-$$(GEN): PRIVATE_PATH := $$(LOCAL_PATH)
-$$(GEN): PRIVATE_CUSTOM_TOOL := $$(EMUGL_EMUGEN) -W $$1 -i $$2 $$3
-$$(GEN): $$(EMUGL_EMUGEN) $$(_emugl_src).attrib $$(_emugl_src).in $$(_emugl_src).types
- $$(transform-generated-source)
-
-$$(call emugl-export,ADDITIONAL_DEPENDENCIES,$$(GEN))
-LOCAL_GENERATED_SOURCES += $$(GEN)
-LOCAL_C_INCLUDES += $$1
-
-#ifneq ($$(HOST_OS),windows)
-$$(call emugl-export,LDFLAGS,-ldl)
-#endif
-
-endef
-
# Call this function when your shared library must be placed in a non-standard
# library path (i.e. not under /system/lib
# $1: library sub-path,relative to /system/lib