move src/main/jniLibs to libs/jniLibs to fix jniLibs local conflict i…

…ssue, and set matterFromSource = false by default
project-chip · Aug 27, 2021 · 30f40c9 · 30f40c9
1 parent d84f29a
commit 30f40c9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/scripts/examples/android_app.sh b/scripts/examples/android_app.sh
@@ -41,4 +41,4 @@ gn gen --check --fail-on-unused-args out/"android_$TARGET_CPU" --args="target_os
 ninja -C out/"android_$TARGET_CPU" src/setup_payload/java src/controller/java default
 
 rsync -a out/"android_$TARGET_CPU"/lib/*.jar src/android/CHIPTool/app/libs
-rsync -a out/"android_$TARGET_CPU"/lib/jni/* src/android/CHIPTool/app/src/main/jniLibs
+rsync -a out/"android_$TARGET_CPU"/lib/jni/* src/android/CHIPTool/app/libs/jniLibs
diff --git a/src/android/CHIPTool/app/build.gradle b/src/android/CHIPTool/app/build.gradle
@@ -60,6 +60,13 @@ android {
             }
         }
     }
+    else {
+        sourceSets {
+            main {
+                jniLibs.srcDirs = ['libs/jniLibs']
+            }
+        }
+    }
 }
 
 dependencies {

diff --git a/...d/CHIPTool/app/src/main/jniLibs/README.md → ...droid/CHIPTool/app/libs/jniLibs/README.md b/...d/CHIPTool/app/src/main/jniLibs/README.md → ...droid/CHIPTool/app/libs/jniLibs/README.md
diff --git a/src/android/CHIPTool/build.gradle b/src/android/CHIPTool/build.gradle
@@ -25,7 +25,7 @@ ext {
     // true to build SDK from source code and debug in Android Stduio
     // use scripts/examples/android_app_as.sh to preapre it
     // false to use SDK prebuilt by  scripts/examples/android_app.sh
-    matterFromSource = true
+    matterFromSource = false
 }
 
 task clean(type: Delete) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,6 +60,13 @@ android { @@
                 }
             }
         }
+        else {
+            sourceSets {
+                main {
+                    jniLibs.srcDirs = ['libs/jniLibs']
+                }
+            }
+        }
     }
     dependencies {
@@ Expand Down @@