diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-26 18:42:33 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-03-26 18:42:33 -0700 |
| commit | 90dfd3839f9f755ee288e5d64fb2221d1512ea8d (patch) | |
| tree | 26dc0339a238b4e2df8225db70713d12d883235f | |
| parent | f2cb0bbbf4029093cfdbf9d3bd6e03989a6ef1b2 (diff) | |
| download | gdk-90dfd3839f9f755ee288e5d64fb2221d1512ea8d.tar.gz | |
Fix buildandroid-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1tools_r21jb-releasejb-mr0-releasejb-dev
Change-Id: I9bc70e4b4a0a7b187bf1108b2542ff0f25d076c0
| -rw-r--r-- | samples/quake/jni/Android-portable.mk | 3 | ||||
| -rw-r--r-- | samples/quake/jni/Android.mk | 3 |
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/ |