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

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

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

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
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_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)
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_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)
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_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs))