summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--samples/quake/jni/Android-portable.mk3
-rw-r--r--samples/quake/jni/Android.mk3
2 files changed, 4 insertions, 2 deletions
diff --git a/samples/quake/jni/Android-portable.mk b/samples/quake/jni/Android-portable.mk
index b95227b..a2fd8b1 100644
--- a/samples/quake/jni/Android-portable.mk
+++ b/samples/quake/jni/Android-portable.mk
@@ -64,10 +64,11 @@ LOCAL_SRC_FILES:= \
zone.cpp
LOCAL_CFLAGS := -fno-zero-initialized-in-bss \
- -I$(OUT)/../../../../system/media/wilhelm/include \
-I$(OUT)/../../../../dalvik/libnativehelper/include \
-I$(OUT)/../../../../frameworks/base/include \
-I$(OUT)/../../../../system/core/include
+LOCAL_C_INCLUDES := $(call include-path-for, wilhelm)
+
include $(BUILD_BITCODE)
diff --git a/samples/quake/jni/Android.mk b/samples/quake/jni/Android.mk
index 66fcfe2..1881080 100644
--- a/samples/quake/jni/Android.mk
+++ b/samples/quake/jni/Android.mk
@@ -34,11 +34,12 @@ LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := -Werror \
-I$(OUT)/../../../../frameworks/compile/libbcc/include \
- -I$(OUT)/../../../../system/media/wilhelm/include \
-I$(OUT)/../../../../dalvik/libnativehelper/include \
-I$(OUT)/../../../../frameworks/base/include \
-I$(OUT)/../../../../system/core/include
+LOCAL_C_INCLUDES := $(call include-path-for, wilhelm)
+
LOCAL_LDLIBS := -llog -lutils -lEGL -lGLESv1_CM -lOpenSLES -lbcc
LOCAL_LDFLAGS := -L$(OUT)/system/lib/