diff options
| author | Nowar Gu <nowar100@gmail.com> | 2011-07-06 01:37:03 +0800 |
|---|---|---|
| committer | Nowar Gu <nowar100@gmail.com> | 2011-07-06 01:37:03 +0800 |
| commit | 286b12dbbcaab1c47734a71d8b94a75385e8b8ef (patch) | |
| tree | 33b03c3c590110304e0763d27479d4294919f3c5 | |
| parent | 07b01d98ed4d018d7105ecedf4033153db255c1f (diff) | |
| download | gdk-286b12dbbcaab1c47734a71d8b94a75385e8b8ef.tar.gz | |
Improve building rules.
| -rw-r--r-- | build/core/build-bitcode.mk | 15 | ||||
| -rw-r--r-- | build/core/build-modules.mk | 4 | ||||
| -rw-r--r-- | platforms/android-portable/arch-llvm/usr/include/test.h | 0 | ||||
| -rw-r--r-- | samples/hello-llvm/jni/Android-portable.mk | 1 |
4 files changed, 18 insertions, 2 deletions
diff --git a/build/core/build-bitcode.mk b/build/core/build-bitcode.mk index dda8e16..c3b2137 100644 --- a/build/core/build-bitcode.mk +++ b/build/core/build-bitcode.mk @@ -4,6 +4,19 @@ ALL_BITCODE_MODULES += $(LOCAL_MODULE) # From now on, we only support these flags. BITCODE_MODULE.$(LOCAL_MODULE).PATH := $(LOCAL_PATH) BITCODE_MODULE.$(LOCAL_MODULE).SRC_FILES := $(LOCAL_SRC_FILES) -BITCODE_MODULE.$(LOCAL_MODULE).C_INCLUDES := $(LOCAL_C_INCLUDES) BITCODE_MODULE.$(LOCAL_MODULE).CFLAGS := $(LOCAL_CFLAGS) BITCODE_MODULE.$(LOCAL_MODULE).CPPFLAGS := $(LOCAL_CFLAGS) $(LOCAL_CPPFLAGS) + +$(foreach include_dir,$(LOCAL_C_INCLUDES),\ + $(eval BITCODE_MODULE.$(LOCAL_MODULE).CFLAGS += -I$(LOCAL_PATH)/$(include_dir))\ +) +$(foreach include_dir,$(BITCODE_C_INCLUDES),\ + $(eval BITCODE_MODULE.$(LOCAL_MODULE).CFLAGS += -I$(include_dir))\ +) + +$(foreach include_dir,$(LOCAL_C_INCLUDES),\ + $(eval BITCODE_MODULE.$(LOCAL_MODULE).CPPFLAGS += -I$(LOCAL_PATH)/$(include_dir))\ +) +$(foreach include_dir,$(BITCODE_C_INCLUDES),\ + $(eval BITCODE_MODULE.$(LOCAL_MODULE).CPPFLAGS += -I$(include_dir))\ +) diff --git a/build/core/build-modules.mk b/build/core/build-modules.mk index cac190c..ec8bba4 100644 --- a/build/core/build-modules.mk +++ b/build/core/build-modules.mk @@ -47,7 +47,9 @@ endef # $2: LOCAL_MODULE # define cmd-link-bc -$(info $(BITCODE_LD) $(GDK_PROJECT_OBJ)/$(2)/*.bc -o $(GDK_PROJECT_OUT)/lib$(2).bc) +$(info $(BITCODE_LD) $(GDK_PROJECT_OBJ)/$(2)/*.bc\ + $(BITCODE_LDFLAGS)\ + -o $(GDK_PROJECT_OUT)/lib$(2).bc) endef $(foreach gdk_module, $(ALL_BITCODE_MODULES),\ diff --git a/platforms/android-portable/arch-llvm/usr/include/test.h b/platforms/android-portable/arch-llvm/usr/include/test.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/platforms/android-portable/arch-llvm/usr/include/test.h diff --git a/samples/hello-llvm/jni/Android-portable.mk b/samples/hello-llvm/jni/Android-portable.mk index 7d0062a..56ab438 100644 --- a/samples/hello-llvm/jni/Android-portable.mk +++ b/samples/hello-llvm/jni/Android-portable.mk @@ -5,6 +5,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := hello_llvm LOCAL_CFLAGS := -D NUM=7788 LOCAL_SRC_FILES := hello_llvm.c test.cpp +LOCAL_C_INCLUDES := jni/test-include include $(BUILD_BITCODE) |