diff options
| author | Joseph Wen <josephwen@google.com> | 2011-07-18 10:44:14 -0700 |
|---|---|---|
| committer | Joseph Wen <josephwen@google.com> | 2011-07-18 10:44:14 -0700 |
| commit | 4a0d42320b45cb8e38d645c48c3a90cdcb5776e8 (patch) | |
| tree | f709b82954e7ad64bd34b27ca2cf554858b74135 | |
| parent | 3ae738a12daed3b289f53b5645d81fc65fd2d7a8 (diff) | |
| download | gdk-4a0d42320b45cb8e38d645c48c3a90cdcb5776e8.tar.gz | |
Add workaround for libbcc
Change-Id: I39ee7892877fde99f9d5b1deecf3358eb52c5c77
| -rwxr-xr-x | gdk-build | 8 | ||||
| -rw-r--r-- | samples/bitmap-plasma-llvm/jni/Android.mk | 7 | ||||
| -rw-r--r-- | toolchains/llvm/setup.mk | 4 |
3 files changed, 16 insertions, 3 deletions
@@ -56,6 +56,12 @@ shift 1 PROGDIR=`dirname $0` PROGDIR=`cd $PROGDIR && pwd` +if [ -z "$OUT" ] ; then + echo "ERROR: Your OUT variable is not defined. Please set it by running \"lunch PRODUCT\"" + echo "This is a workaroud for libbcc" + exit 1 +fi + # If GNUMAKE is defined, check that it points to a valid file if [ -n "$GNUMAKE" ] ; then ABS_GNUMAKE=`which $GNUMAKE 2> /dev/null` @@ -102,7 +108,7 @@ if [ "$OSTYPE" = "cygwin" ] ; then fi fi -$GNUMAKE -f $PROGDIR/build/core/build-local.mk "$@" +NDK_ROOT=$NDK_ROOT $GNUMAKE -f $PROGDIR/build/core/build-local.mk "$@" # Transfer the control power to NDK if [ $? -eq 0 ]; then diff --git a/samples/bitmap-plasma-llvm/jni/Android.mk b/samples/bitmap-plasma-llvm/jni/Android.mk index 2440fe9..c82a116 100644 --- a/samples/bitmap-plasma-llvm/jni/Android.mk +++ b/samples/bitmap-plasma-llvm/jni/Android.mk @@ -8,8 +8,11 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := plasmaLLVM.cpp -LOCAL_C_INCLUDES := frameworks/compile/libbcc/include +LOCAL_C_INCLUDES := $(NDK_ROOT)/../frameworks/compile/libbcc/include -LOCAL_SHARED_LIBRARIES := libm liblog libjnigraphics libbcc +# Workaround. libbcc is not part of NDK +LOCAL_LDFLAGS := $(OUT)/system/lib/libbcc.so + +LOCAL_LDFLAGS += -lm -llog -ljnigraphics include $(BUILD_SHARED_LIBRARY) diff --git a/toolchains/llvm/setup.mk b/toolchains/llvm/setup.mk index 074ab94..7fff797 100644 --- a/toolchains/llvm/setup.mk +++ b/toolchains/llvm/setup.mk @@ -10,6 +10,10 @@ TARGET_C_INCLUDES := $(GDK_PLATFORMS_ROOT)/android-portable/arch-llvm/usr/include +# Workaround before the required headers are in the above dir. +TARGET_C_INCLUDES += $(NDK_ROOT)/platforms/android-9/arch-arm/usr/include/ \ + $(NDK_ROOT)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/lib/gcc/arm-linux-androideabi/4.4.3/include + TARGET_CC := clang TARGET_CFLAGS := -ccc-host-triple armv7-none-linux-gnueabi -emit-llvm |