diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-08-29 21:49:13 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2011-09-13 10:29:10 +0200 |
| commit | 94c077feeae990a1ff6f013b62dcb79219733286 (patch) | |
| tree | bfc4fde91111d6dcf8f1e77a9dbaca353fef782d /build | |
| parent | c76182806ae462c350da1ce26213449b992e09cc (diff) | |
| download | sdk-94c077feeae990a1ff6f013b62dcb79219733286.zip sdk-94c077feeae990a1ff6f013b62dcb79219733286.tar.gz sdk-94c077feeae990a1ff6f013b62dcb79219733286.tar.bz2 | |
Copy OpenGLES emulation libraries to SDK installation.
This patch ensures that the following host shared libraries
are copies to $SDK/tools/lib, when building the SDK:
- libOpenglRender
- libEGL_translator
- libGLES_CM_translator
- libGLES_V2_translator
Note that the Windows DLL must be copied manually in patch_windows_sdk.sh
I didn't find a way to make it work using tools.atree.
This has been tested to build the Linux, Windows and OS X SDK images.
Change-Id: Idae8fe705befbbcc31e8d4ff71998ea0803b32f1
Diffstat (limited to 'build')
| -rwxr-xr-x | build/patch_windows_sdk.sh | 3 | ||||
| -rw-r--r-- | build/tools.atree | 6 | ||||
| -rw-r--r-- | build/windows_sdk_tools.mk | 9 |
3 files changed, 18 insertions, 0 deletions
diff --git a/build/patch_windows_sdk.sh b/build/patch_windows_sdk.sh index b01e41e..9dacce3 100755 --- a/build/patch_windows_sdk.sh +++ b/build/patch_windows_sdk.sh @@ -24,6 +24,7 @@ TOOLS=$TEMP_SDK_DIR/tools LIB=$TEMP_SDK_DIR/tools/lib rm $V $TOOLS/{android,apkbuilder,ddms,draw9patch} rm $V $TOOLS/{emulator,emulator-arm,emulator-x86} +rm $V $TOOLS/lib/{libOpenglRender.so,libGLES_CM_translator.so,libGLES_V2_translator.so,libEGL_translator.so} rm $V $TOOLS/{hierarchyviewer,layoutopt,mksdcard,traceview,monkeyrunner} rm $V $TOOLS/proguard/bin/*.sh @@ -33,6 +34,8 @@ rm $V $TOOLS/proguard/bin/*.sh # be obsolete when we switch to an .atree format. # -- cp $V $WIN_OUT_DIR/host/windows-x86/bin/*.{exe,dll} $TOOLS/ +cp $V $WIN_OUT_DIR/host/windows-x86/lib/lib*.dll $LIB + # Copy the SDK Manager (aka sdklauncher) to the root of the SDK (it was copied in tools above) # and move it also in SDK/tools/lib (so that tools updates can update the root one too) cp $TOOLS/sdklauncher.exe $TEMP_SDK_DIR/"SDK Manager.exe" diff --git a/build/tools.atree b/build/tools.atree index 4e84523..978615f 100644 --- a/build/tools.atree +++ b/build/tools.atree @@ -47,6 +47,12 @@ sdk/emulator/snapshot/snapshots.img tools/lib/emulator/snapshots.img usr/share/pc-bios/bios.bin tools/lib/pc-bios/bios.bin usr/share/pc-bios/vgabios-cirrus.bin tools/lib/pc-bios/vgabios-cirrus.bin +# OpenGLES emulation libraries +lib/libOpenglRender${DLL_EXTENSION} tools/lib/libOpenglRender${DLL_EXTENSION} +lib/libGLES_CM_translator${DLL_EXTENSION} tools/lib/libGLES_CM_translator${DLL_EXTENSION} +lib/libGLES_V2_translator${DLL_EXTENSION} tools/lib/libGLES_V2_translator${DLL_EXTENSION} +lib/libEGL_translator${DLL_EXTENSION} tools/lib/libEGL_translator${DLL_EXTENSION} + # Java-Based SDK Tools bin/ddms tools/ddms bin/hierarchyviewer tools/hierarchyviewer diff --git a/build/windows_sdk_tools.mk b/build/windows_sdk_tools.mk index 73f4d12..9f3db4b 100644 --- a/build/windows_sdk_tools.mk +++ b/build/windows_sdk_tools.mk @@ -10,3 +10,12 @@ WIN_SDK_TARGETS := \ mksdcard \ sdklauncher +# Add OpenGLES emulation host libraries if needed. +ifeq (true,$(BUILD_EMULATOR_OPENGL)) +WIN_SDK_TARGETS += \ + libOpenglRender \ + libGLES_CM_translator \ + libGLES_V2_translator \ + libEGL_translator +endif + |