am 50dd0170: Merge "Fix linux sdk build."

* commit '50dd0170660e4ef98ec3eb470eb6ce053d2b9825':
  Fix linux sdk build.
This commit is contained in:
David 'Digit' Turner
2011-03-29 09:55:00 -07:00
committed by Android Git Automerger

View File

@@ -1,3 +1,9 @@
# Building this module breaks the Linux build because
# libxcb.so is not installed in the i686-linux-glibc2.7-4.4.3
# prebuilt sysroot. Since rebuilding it will take some time, here's a
# quick fix to unbreak it.
#
ifneq (,$(BUILD_EMULATOR_OPENGL))
LOCAL_PATH:=$(call my-dir)
@@ -50,3 +56,5 @@ LOCAL_LDLIBS := -lpthread -lX11 -lrt
include $(BUILD_HOST_EXECUTABLE)
endif # HOST_OS == linux
endif # BUILD_EMULATOR_OPENGL