LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am e3e74aa5: am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"

Browse Source 
* commit 'e3e74aa50e74a3465295b9405ea0fccca62472a1':
  Move stuff from prebuilt to prebuilts/tools
This commit is contained in:
Xavier Ducrohet
2012-04-04 14:03:32 -07:00
committed by Android Git Automerger
parent c793583628 e3e74aa50e
commit 4db2099768
6 changed files with 4 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
build/sdk-darwin-x86.atree
View File

@@ -15,27 +15,9 @@
# #
############################################################################## ##############################################################################
# Platform Tools Component # Docs Component
############################################################################## ##############################################################################
##############################################################################
# Tools Component
# Legacy: this should be moved to sdk/build/tools.atree
##############################################################################
# swt
prebuilt/darwin-x86/swt/swt.jar tools/lib/x86/swt.jar
prebuilt/darwin-x86_64/swt/swt.jar tools/lib/x86_64/swt.jar
# JetCreator (only available on mac/windows)
external/sonivox/jet_tools/JetCreator tools/Jet/JetCreator
prebuilt/darwin-x86/jetcreator/libEASLIb.dylib tools/Jet/JetCreator/libEASLIb.dylib
external/sonivox/jet_tools/JetCreator_content tools/Jet/demo_content
external/sonivox/jet_tools/logic_templates tools/Jet/logic_templates
external/sonivox/docs/JET_Authoring_Guidelines.html docs/JetCreator/JET_Authoring_Guidelines.html external/sonivox/docs/JET_Authoring_Guidelines.html docs/JetCreator/JET_Authoring_Guidelines.html
external/sonivox/docs/JET_Authoring_Guidelines_files docs/JetCreator/JET_Authoring_Guidelines_files external/sonivox/docs/JET_Authoring_Guidelines_files docs/JetCreator/JET_Authoring_Guidelines_files
external/sonivox/docs/JET_Creator_User_Manual.html docs/JetCreator/JET_Creator_User_Manual.html external/sonivox/docs/JET_Creator_User_Manual.html docs/JetCreator/JET_Creator_User_Manual.html

13
build/sdk-linux-x86.atree
View File

@@ -14,17 +14,4 @@
# limitations under the License. # limitations under the License.
# #
##############################################################################
# Platform Tools Component
##############################################################################
##############################################################################
# Tools Component
# Legacy: this should be moved to sdk/build/tools.atree
##############################################################################
# swt
prebuilt/linux-x86/swt/swt.jar tools/lib/x86/swt.jar
prebuilt/linux-x86_64/swt/swt.jar tools/lib/x86_64/swt.jar

7
build/sdk-windows-x86.atree
View File

@@ -48,13 +48,6 @@ bin/dexdump.exe strip platform-tools/dexdump.exe
rm platform-tools/llvm-rs-cc rm platform-tools/llvm-rs-cc
bin/llvm-rs-cc.exe strip platform-tools/llvm-rs-cc.exe bin/llvm-rs-cc.exe strip platform-tools/llvm-rs-cc.exe
prebuilt/windows/swt/swt.jar tools/lib/x86/swt.jar
prebuilt/windows-x86_64/swt/swt.jar tools/lib/x86_64/swt.jar
external/sonivox/jet_tools/JetCreator tools/Jet/JetCreator
external/sonivox/jet_tools/JetCreator_content tools/Jet/demo_content
external/sonivox/jet_tools/logic_templates tools/Jet/logic_templates
prebuilt/windows/jetcreator/EASDLL.dll tools/Jet/JetCreator/EASDLL.dll
external/sonivox/docs/JET_Authoring_Guidelines.html docs/JetCreator/JET_Authoring_Guidelines.html external/sonivox/docs/JET_Authoring_Guidelines.html docs/JetCreator/JET_Authoring_Guidelines.html
external/sonivox/docs/JET_Authoring_Guidelines_files docs/JetCreator/JET_Authoring_Guidelines_files external/sonivox/docs/JET_Authoring_Guidelines_files docs/JetCreator/JET_Authoring_Guidelines_files
external/sonivox/docs/JET_Creator_User_Manual.html docs/JetCreator/JET_Creator_User_Manual.html external/sonivox/docs/JET_Creator_User_Manual.html docs/JetCreator/JET_Creator_User_Manual.html

2
tools/emulator/opengl/tests/emulator_test_renderer/Android.mk
View File

@@ -6,7 +6,7 @@ $(call emugl-import,libOpenglRender event_injector)
LOCAL_SRC_FILES := main.cpp LOCAL_SRC_FILES := main.cpp
PREBUILT := $(HOST_PREBUILT_TAG) PREBUILT := $(HOST_PREBUILT_TAG)
LOCAL_SDL_CONFIG ?= prebuilt/$(PREBUILT)/sdl/bin/sdl-config LOCAL_SDL_CONFIG ?= prebuilts/tools/$(PREBUILT)/sdl/bin/sdl-config
LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags) LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags)
LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs)) LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs))

2
tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk
View File

@@ -4,7 +4,7 @@ $(call emugl-begin-host-executable,triangleCM)
$(call emugl-import,libEGL_translator libGLES_CM_translator) $(call emugl-import,libEGL_translator libGLES_CM_translator)
PREBUILT := $(HOST_PREBUILT_TAG) PREBUILT := $(HOST_PREBUILT_TAG)
LOCAL_SDL_CONFIG ?= prebuilt/$(PREBUILT)/sdl/bin/sdl-config LOCAL_SDL_CONFIG ?= prebuilts/tools/$(PREBUILT)/sdl/bin/sdl-config
LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags) LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags)
LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs)) LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs))

2
tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk
View File

@@ -4,7 +4,7 @@ $(call emugl-begin-host-executable,triangleV2)
$(call emugl-import,libEGL_translator libGLES_V2_translator) $(call emugl-import,libEGL_translator libGLES_V2_translator)
PREBUILT := $(HOST_PREBUILT_TAG) PREBUILT := $(HOST_PREBUILT_TAG)
LOCAL_SDL_CONFIG ?= prebuilt/$(PREBUILT)/sdl/bin/sdl-config LOCAL_SDL_CONFIG ?= prebuilts/tools/$(PREBUILT)/sdl/bin/sdl-config
LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags) LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags)
LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs)) LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs))