Skip to content

Commit 45672e6

Browse files
committed
Working Android build. Min SDK is now 21 which is Android 5.0
1 parent c60263a commit 45672e6

File tree

5 files changed

+29
-4
lines changed

5 files changed

+29
-4
lines changed

AndroidStudioProjects/nftSimpleProj/nftSimple/src/main/jni/Application.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ APP_MODULES := nftSimpleNative
5252
#APP_OPTIM := release
5353
#APP_OPTIM := debug
5454
#APP_ABI := all
55-
APP_ABI := armeabi armeabi-v7a x86 mips
55+
APP_ABI := armeabi-v7a x86
5656
#APP_ABI := armeabi armeabi-v7a x86 mips arm64-v8a x86_64 mips64
5757
APP_PLATFORM := android-15
5858
APP_STL := c++_shared

android/jni/Android-ARWrapper.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ LOCAL_SRC_FILES := $(MY_FILES)
116116

117117
LOCAL_C_INCLUDES += $(ARTOOLKIT_ROOT)/include/android $(ARTOOLKIT_ROOT)/include
118118
LOCAL_CFLAGS += -DHAVE_NFT=1 $(MY_CFLAGS)
119-
LOCAL_LDLIBS += -llog -lGLESv1_CM -lz -lfts
119+
LOCAL_LDLIBS += -llog -lGLESv1_CM -lz
120120
LOCAL_WHOLE_STATIC_LIBRARIES += ar
121121
LOCAL_STATIC_LIBRARIES += ar2 kpm argsub_es armulti aricp arvideo arutil jpeg cpufeatures
122122
#LOCAL_SHARED_LIBRARIES += $(CURL_LIBS)

android/jni/Application-ARWrapper.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ APP_MODULES := ARWrapper
4545
#APP_ABI := all
4646
#APP_ABI := armeabi armeabi-v7a x86 mips
4747
APP_ABI := armeabi-v7a x86 arm64-v8a x86_64
48-
APP_PLATFORM := android-15
48+
APP_PLATFORM := android-21
4949
APP_STL := c++_shared
5050
APP_CPPFLAGS := -frtti -fexceptions
5151
NDK_TOOLCHAIN_VERSION := clang

android/jni/Application.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ APP_MODULES := ar aricp argsub_es argsub_es2 armulti eden kpm ar2 arutil arosg
4343
#APP_ABI := all
4444
#APP_ABI := armeabi armeabi-v7a x86 mips
4545
APP_ABI := armeabi-v7a x86 arm64-v8a x86_64
46-
APP_PLATFORM := android-15
46+
APP_PLATFORM := android-21
4747
APP_STL := c++_shared
4848
APP_CPPFLAGS := -frtti -fexceptions
4949
NDK_TOOLCHAIN_VERSION := clang

examples/ARAppCameraTest/Images.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"size" : "29x29",
515
"idiom" : "iphone",
@@ -54,6 +64,16 @@
5464
"filename" : "[email protected]",
5565
"scale" : "3x"
5666
},
67+
{
68+
"idiom" : "ipad",
69+
"size" : "20x20",
70+
"scale" : "1x"
71+
},
72+
{
73+
"idiom" : "ipad",
74+
"size" : "20x20",
75+
"scale" : "2x"
76+
},
5777
{
5878
"size" : "29x29",
5979
"idiom" : "ipad",
@@ -119,6 +139,11 @@
119139
"idiom" : "ipad",
120140
"filename" : "[email protected]",
121141
"scale" : "2x"
142+
},
143+
{
144+
"idiom" : "ios-marketing",
145+
"size" : "1024x1024",
146+
"scale" : "1x"
122147
}
123148
],
124149
"info" : {

0 commit comments

Comments
 (0)