From a5b28ece7198c5996353ac550cc3230da5cd3752 Mon Sep 17 00:00:00 2001 From: Cass Everitt Date: Thu, 6 Jun 2013 00:19:17 -0500 Subject: [PATCH] adjust location of android makefiles --- build/android/Regal/{jni => }/Android.mk | 4 ++-- build/android/Regal/{jni => }/Application.mk | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename build/android/Regal/{jni => }/Android.mk (95%) rename build/android/Regal/{jni => }/Application.mk (100%) diff --git a/build/android/Regal/jni/Android.mk b/build/android/Regal/Android.mk similarity index 95% rename from build/android/Regal/jni/Android.mk rename to build/android/Regal/Android.mk index cf55ac2..6cba16b 100644 --- a/build/android/Regal/jni/Android.mk +++ b/build/android/Regal/Android.mk @@ -15,7 +15,7 @@ endif regal_cflags := -DANDROID=1 -DREGAL_NO_PNG=1 -Werror -regal_path := $(LOCAL_PATH)/../../../.. +regal_path := $(LOCAL_PATH)/../../.. include $(regal_path)/build/regal.inc @@ -25,7 +25,7 @@ regal_src_files += $(regal_path)/src/mongoose/mongoose.c $(regal_path)/src/md5/s regal_src_files := $(patsubst $(LOCAL_PATH)/%,%,$(regal_src_files)) regal_c_includes := $(regal_path)/include $(regal_path)/src/regal $(regal_path)/src/boost $(regal_path)/src/mongoose $(regal_path)/src/md5/include $(regal_path)/src/lookup3 $(regal_path)/src/jsonsl -regal_c_includes := $(patsubst $(LOCAL_PATH)/../%,%,$(regal_c_includes)) +#regal_c_includes := $(patsubst $(LOCAL_PATH)/%,%,$(regal_c_includes)) regal_export_c_includes := $(regal_path)/include diff --git a/build/android/Regal/jni/Application.mk b/build/android/Regal/Application.mk similarity index 100% rename from build/android/Regal/jni/Application.mk rename to build/android/Regal/Application.mk