| commit | 494fa06eeca273dff41ffbc2a6cfcce4827295ea | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Thu Apr 05 07:02:02 2012 -0700 |
| committer | The Android Automerger <android-build@android.com> | Thu Apr 05 07:02:02 2012 -0700 |
| tree | be5ba0e1d7308c4ceb8efcc48b23bdab9930f5fc | |
| parent | f597bde4b03c8732013c673ca920599d1ee3160d [diff] | |
| parent | 3c408d02d99bd376bb9b5e62e9836faceacdc8c6 [diff] |
merge in jb-release history after reset to master
diff --git a/Makefile.common b/Makefile.common index da3226e..77fd367 100644 --- a/Makefile.common +++ b/Makefile.common
@@ -220,7 +220,7 @@ ifneq ($(BUILD_SDL_FROM_SOURCES),true) - SDL_CONFIG ?= prebuilt/$(QEMU_HOST_TAG)/sdl/bin/sdl-config + SDL_CONFIG ?= prebuilts/tools/$(QEMU_HOST_TAG)/sdl/bin/sdl-config SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags) # We need to filter out the _GNU_SOURCE variable because it breaks recent