Skip to content

Commit

Permalink
Add back Android default build coverage & fix the build (#3966)
Browse files Browse the repository at this point in the history
mDNS doesn't build with no device layer. Remove it from the build and
add back the coverage that would catch this that was lost in #3340.
  • Loading branch information
mspang authored Nov 30, 2020
1 parent b572719 commit 5697043
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion scripts/examples/android_app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# limitations under the License.
#

set -e
set -x
env

Expand All @@ -37,7 +38,7 @@ fi
# Build shared CHIP libs
source scripts/activate.sh
gn gen --check --fail-on-unused-args out/"android_$TARGET_CPU" --args="target_os=\"android\" target_cpu=\"$TARGET_CPU\" android_ndk_root=\"$ANDROID_NDK_HOME\" android_sdk_root=\"$ANDROID_HOME\""
ninja -C out/"android_$TARGET_CPU" src/setup_payload/java src/controller/java
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
Expand Down
5 changes: 4 additions & 1 deletion src/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ if (chip_build_tests) {
"${chip_root}/src/app/tests",
"${chip_root}/src/crypto/tests",
"${chip_root}/src/inet/tests",
"${chip_root}/src/lib/mdns/minimal/tests",
"${chip_root}/src/messaging/tests",
"${chip_root}/src/protocols/bdx/tests",
"${chip_root}/src/system/tests",
Expand All @@ -50,6 +49,10 @@ if (chip_build_tests) {
"${chip_root}/src/transport/tests",
]

if (chip_device_platform != "none") {
deps += [ "${chip_root}/src/lib/mdns/minimal/tests" ]
}

if (chip_device_platform != "esp32") {
deps += [
"${chip_root}/src/lib/asn1/tests",
Expand Down

0 comments on commit 5697043

Please sign in to comment.