summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJihun Ha <jihun.ha@samsung.com>2017-05-22 19:22:41 +0900
committerUze Choi <uzchoi@samsung.com>2017-05-23 02:45:43 +0000
commit9e5f80aebb4458ff70285f7f8967940ef762ea4c (patch)
tree6abe9f01865f2d4b65afbbf5232edf01fbd1bc46
parent26c7b6c5b88e6fd6dfe1db54a5a67425a815c69a (diff)
downloadiotivity-9e5f80aebb4458ff70285f7f8967940ef762ea4c.tar.gz
iotivity-9e5f80aebb4458ff70285f7f8967940ef762ea4c.tar.bz2
iotivity-9e5f80aebb4458ff70285f7f8967940ef762ea4c.zip
Remove a build warning in Easy setup for Android build
* Change minSdkVersion to 21 in AndroidManifest.xml * Change target source files for jni build ONLY to cpp files Change-Id: Ic45acb59d66d30c991514a2bec38583c0e7f1550 Signed-off-by: Jihun Ha <jihun.ha@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/20243 Reviewed-by: Senthil Kumar G S <senthil.gs@samsung.com> Tested-by: jenkins-iotivity <jenkins@iotivity.org> Reviewed-by: Uze Choi <uzchoi@samsung.com>
-rw-r--r--service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/AndroidManifest.xml2
-rwxr-xr-xservice/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk3
-rwxr-xr-xservice/easy-setup/mediator/richsdk/android/SConscript4
3 files changed, 5 insertions, 4 deletions
diff --git a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/AndroidManifest.xml b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/AndroidManifest.xml
index 64487cd73..63a60102a 100644
--- a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/AndroidManifest.xml
+++ b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
android:versionName="1.0" >
<uses-sdk
- android:minSdkVersion="8"
+ android:minSdkVersion="21"
android:targetSdkVersion="21" />
<application
diff --git a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk
index d3b42dcec..ebda1762e 100755
--- a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk
+++ b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk
@@ -87,8 +87,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/../../../../../../../../../extlibs/boost/boost_1_58_0 \
$(LOCAL_PATH)/../../../../../../../../../java/jni \
-LOCAL_SRC_FILES += $(patsubst $(LOCAL_PATH)/%, %, $(wildcard $(LOCAL_PATH)/*.cpp))
-LOCAL_SRC_FILES += $(patsubst $(LOCAL_PATH)/%, %, $(wildcard $(LOCAL_PATH)/*.h))
+LOCAL_SRC_FILES := $(patsubst $(LOCAL_PATH)/%, %, $(wildcard $(LOCAL_PATH)/*.cpp))
LOCAL_LDLIBS := -llog
#LOCAL_SHARED_LIBRARIES += android-connectivity_abstraction
diff --git a/service/easy-setup/mediator/richsdk/android/SConscript b/service/easy-setup/mediator/richsdk/android/SConscript
index 21b3c043c..0e6ebb68e 100755
--- a/service/easy-setup/mediator/richsdk/android/SConscript
+++ b/service/easy-setup/mediator/richsdk/android/SConscript
@@ -65,7 +65,9 @@ if not os.path.exists(android_home + '/platforms/android-21') or not os.path.exi
#SConscript("../../../../../../android/android_api/SConscript")
def ensure_libs(target, source, env):
- return target, [source, env.get('BUILD_DIR') + 'liboc.so', env.get('BUILD_DIR') + 'liboc_logger.so']
+ return target, [source, env.get('BUILD_DIR') + 'liboc.so',
+ env.get('BUILD_DIR') + 'liboc_logger.so',
+ env.get('BUILD_DIR') + 'libESMediatorRich.so']
jdk_env = Environment(ENV=os.environ)
jdk_env['BUILDERS']['Gradle'] = Builder(action = env.get('ANDROID_GRADLE') +