Skip to content

Commit 9230b81

Browse files
vimfungvimfung
committed
修复Unity下Android lib编译错误问题
Former-commit-id: 3b67268caf425b42103789974b68628fd6ece0ac
1 parent 9accefc commit 9230b81

File tree

3 files changed

+16
-29
lines changed

3 files changed

+16
-29
lines changed

‎Sample/Android/app/app.iml‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,6 @@
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
7070
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7171
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
79-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -85,7 +77,14 @@
8577
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8678
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8779
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8988
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9089
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9190
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -94,22 +93,11 @@
9493
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.1.0/jars" />
9594
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.1.0/jars" />
9695
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
9996
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
10497
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
10798
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
10999
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
111100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
112-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
113101
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
114102
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
115103
</content>

‎Source/Unity3D/Android/luascriptcore-unity-android/luascriptcore-unity-android.iml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,20 @@
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7070
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7171
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7972
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8073
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8174
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
8275
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
8376
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8477
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8578
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/.DS_Store" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8886
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8987
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9088
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

‎Source/Unity3D/Android/luascriptcore-unity-android/src/main/jni/Android.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ LOCAL_SRC_FILES := \
7070
$(LOCAL_PATH)/../../../../../../lua-common/LuaExportMethodDescriptor.cpp \
7171
$(LOCAL_PATH)/../../../../../../lua-common/LuaExportsTypeManager.cpp \
7272
$(LOCAL_PATH)/../../../../../../lua-common/LuaExportPropertyDescriptor.cpp \
73+
$(LOCAL_PATH)/../../../../../../lua-common/LuaTmpValue.cpp \
7374

7475
LOCAL_C_INCLUDES += $(LOCAL_PATH)
7576
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../../../../lua-core/src

0 commit comments

Comments
 (0)