From ecab3196aee706077bb9b431f190f5c62460f41d Mon Sep 17 00:00:00 2001 From: xylophone21 Date: Mon, 15 Nov 2021 19:34:08 +0800 Subject: [PATCH] fix restyled-io and ci issues --- .../tcl/chip/chiptvserver/MainActivity.java | 4 +--- examples/tv-app/android/BUILD.gn | 15 ++++++--------- examples/tv-app/android/java/TVApp-JNI.cpp | 8 +++++--- .../android/java/src/com/tcl/tvapp/TvApp.java | 11 +++++------ scripts/build/builders/android.py | 19 ++++++++++--------- .../build/testdata/build_all_except_host.txt | 16 ++++++++-------- scripts/examples/gn_android_example.sh | 6 +++--- src/app/server/java/AndroidAppServerWrapper.h | 2 +- src/app/server/java/BUILD.gn | 2 +- 9 files changed, 40 insertions(+), 43 deletions(-) diff --git a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java index 9562033266316e..7e0e8cc18a2abc 100644 --- a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java +++ b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java @@ -5,9 +5,6 @@ import android.widget.ImageView; import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; - -import com.tcl.tvapp.TvApp; - import chip.appserver.ChipAppServer; import chip.platform.AndroidBleManager; import chip.platform.AndroidChipPlatform; @@ -18,6 +15,7 @@ import chip.setuppayload.DiscoveryCapability; import chip.setuppayload.SetupPayload; import chip.setuppayload.SetupPayloadParser; +import com.tcl.tvapp.TvApp; import java.util.HashSet; public class MainActivity extends AppCompatActivity { diff --git a/examples/tv-app/android/BUILD.gn b/examples/tv-app/android/BUILD.gn index 627a24d55bbdd4..ecb6b5964a0f95 100644 --- a/examples/tv-app/android/BUILD.gn +++ b/examples/tv-app/android/BUILD.gn @@ -20,9 +20,8 @@ import("${chip_root}/build/chip/java/rules.gni") import("${chip_root}/build/chip/tools.gni") shared_library("jni") { - output_name = "libTvApp" - + sources = [ "${chip_root}/examples/tv-app/tv-common/include/CHIPProjectAppConfig.h", "include/account-login/AccountLoginManager.cpp", @@ -58,9 +57,9 @@ shared_library("jni") { deps = [ "${chip_root}/examples/tv-app/tv-common", + "${chip_root}/src/app/server/java:jni", "${chip_root}/src/lib", "${chip_root}/third_party/inipp", - "${chip_root}/src/app/server/java:jni", ] cflags = [ "-Wconversion" ] @@ -83,9 +82,7 @@ android_library("java") { "${chip_root}/build/chip/java:shared_cpplib", ] - sources = [ - "java/src/com/tcl/tvapp/TvApp.java", - ] + sources = [ "java/src/com/tcl/tvapp/TvApp.java" ] javac_flags = [ "-Xlint:deprecation" ] @@ -100,10 +97,10 @@ java_prebuilt("android") { group("default") { deps = [ ":android", - ":jni", ":java", + ":jni", + "${chip_root}/src/app/server/java", "${chip_root}/src/platform/android:java", "${chip_root}/src/setup_payload/java", - "${chip_root}/src/app/server/java", ] -} \ No newline at end of file +} diff --git a/examples/tv-app/android/java/TVApp-JNI.cpp b/examples/tv-app/android/java/TVApp-JNI.cpp index 05c650cae1ab7d..4f5d09b5445776 100644 --- a/examples/tv-app/android/java/TVApp-JNI.cpp +++ b/examples/tv-app/android/java/TVApp-JNI.cpp @@ -21,15 +21,17 @@ * Implementation of JNI bridge for Tv App on Android. * */ +#include #include #include #include -#include -jint JNI_OnLoad(JavaVM * jvm, void * reserved) { +jint JNI_OnLoad(JavaVM * jvm, void * reserved) +{ return AndroidAppServerJNI_OnLoad(jvm, reserved); } -void JNI_OnUnload(JavaVM * jvm, void * reserved) { +void JNI_OnUnload(JavaVM * jvm, void * reserved) +{ return AndroidAppServerJNI_OnUnload(jvm, reserved); } diff --git a/examples/tv-app/android/java/src/com/tcl/tvapp/TvApp.java b/examples/tv-app/android/java/src/com/tcl/tvapp/TvApp.java index ec78582c5141f8..f4afa50734fcf4 100644 --- a/examples/tv-app/android/java/src/com/tcl/tvapp/TvApp.java +++ b/examples/tv-app/android/java/src/com/tcl/tvapp/TvApp.java @@ -18,10 +18,9 @@ package com.tcl.tvapp; public class TvApp { - public TvApp() { - } + public TvApp() {} - static { - System.loadLibrary("TvApp"); - } -} \ No newline at end of file + static { + System.loadLibrary("TvApp"); + } +} diff --git a/scripts/build/builders/android.py b/scripts/build/builders/android.py index d83541b1bc8ed7..8619ebaf9a5eab 100644 --- a/scripts/build/builders/android.py +++ b/scripts/build/builders/android.py @@ -142,7 +142,7 @@ def copyToSrcAndroid(self): libs_dir = os.path.join( self.root, 'src/android/', self.app.AppName(), 'app/libs') self._Execute(['mkdir', '-p', jnilibs_dir], - title='Prepare Native libs ' + self.identifier) + title='Prepare Native libs ' + self.identifier) # TODO: Runtime dependencies should be computed by the build system rather than hardcoded # GN supports getting these dependencies like: @@ -173,7 +173,7 @@ def copyToExampleAndroid(self): libs_dir = os.path.join( self.root, 'examples', self.app.ExampleName(), 'android/App/app/libs') self._Execute(['mkdir', '-p', jnilibs_dir], - title='Prepare Native libs ' + self.identifier) + title='Prepare Native libs ' + self.identifier) for libName in ['libSetupPayloadParser.so', 'libc++_shared.so', 'libTvApp.so']: self._Execute(['cp', os.path.join(self.output_dir, 'lib', 'jni', self.board.AbiName( @@ -194,22 +194,22 @@ def gradlewBuildSrcAndroid(self): # App compilation self._Execute([ '%s/src/android/%s/gradlew' % (self.root, - self.app.AppName()), '-p', + self.app.AppName()), '-p', '%s/src/android/%s' % (self.root, - self.app.AppName()), + self.app.AppName()), '-PmatterBuildSrcDir=%s' % self.output_dir, '-PmatterSdkSourceBuild=false', '-PbuildDir=%s' % self.output_dir, 'assembleDebug' ], title='Building APP ' + self.identifier) - + def gradlewBuildExampleAndroid(self): # Example compilation self._Execute([ '%s/examples/%s/android/App/gradlew' % (self.root, - self.app.ExampleName()), '-p', + self.app.ExampleName()), '-p', '%s/examples/%s/android/App/' % (self.root, - self.app.ExampleName()), + self.app.ExampleName()), '-PmatterBuildSrcDir=%s' % self.output_dir, '-PmatterSdkSourceBuild=false', '-PbuildDir=%s' % self.output_dir, 'assembleDebug' @@ -254,7 +254,8 @@ def generate(self): exampleName = self.app.ExampleName() if exampleName is not None: - gn_gen += ['--root=%s/examples/%s/android/' % (self.root, exampleName)] + gn_gen += ['--root=%s/examples/%s/android/' % + (self.root, exampleName)] if self.board.IsIde(): gn_gen += ['--ide=json', @@ -298,7 +299,7 @@ def _build(self): else: self._Execute(['ninja', '-C', self.output_dir], title='Building JNI ' + self.identifier) - + exampleName = self.app.ExampleName() if exampleName is None: self.copyToSrcAndroid() diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt index d38f3a365b776f..36c1866eda665b 100644 --- a/scripts/build/testdata/build_all_except_host.txt +++ b/scripts/build/testdata/build_all_except_host.txt @@ -517,21 +517,21 @@ cp {out}/android-arm64-chip-tool/lib/src/platform/android/AndroidPlatform.jar {r ninja -C {out}/android-arm64-chip-tvserver # Prepare Native libs android-arm64-chip-tvserver -mkdir -p {root}/examples/tv-app/App/app/libs/jniLibs/arm64-v8a +mkdir -p {root}/examples/tv-app/android/App/app/libs/jniLibs/arm64-v8a -cp {out}/android-arm64-chip-tvserver/lib/jni/arm64-v8a/libSetupPayloadParser.so {root}/examples/tv-app/App/app/libs/jniLibs/arm64-v8a/libSetupPayloadParser.so +cp {out}/android-arm64-chip-tvserver/lib/jni/arm64-v8a/libSetupPayloadParser.so {root}/examples/tv-app/android/App/app/libs/jniLibs/arm64-v8a/libSetupPayloadParser.so -cp {out}/android-arm64-chip-tvserver/lib/jni/arm64-v8a/libc++_shared.so {root}/examples/tv-app/App/app/libs/jniLibs/arm64-v8a/libc++_shared.so +cp {out}/android-arm64-chip-tvserver/lib/jni/arm64-v8a/libc++_shared.so {root}/examples/tv-app/android/App/app/libs/jniLibs/arm64-v8a/libc++_shared.so -cp {out}/android-arm64-chip-tvserver/lib/jni/arm64-v8a/libTvApp.so {root}/examples/tv-app/App/app/libs/jniLibs/arm64-v8a/libTvApp.so +cp {out}/android-arm64-chip-tvserver/lib/jni/arm64-v8a/libTvApp.so {root}/examples/tv-app/android/App/app/libs/jniLibs/arm64-v8a/libTvApp.so -cp {out}/android-arm64-chip-tvserver/lib/third_party/connectedhomeip/src/setup_payload/java/SetupPayloadParser.jar {root}/examples/tv-app/App/app/libs/SetupPayloadParser.jar +cp {out}/android-arm64-chip-tvserver/lib/third_party/connectedhomeip/src/setup_payload/java/SetupPayloadParser.jar {root}/examples/tv-app/android/App/app/libs/SetupPayloadParser.jar -cp {out}/android-arm64-chip-tvserver/lib/third_party/connectedhomeip/src/platform/android/AndroidPlatform.jar {root}/examples/tv-app/App/app/libs/AndroidPlatform.jar +cp {out}/android-arm64-chip-tvserver/lib/third_party/connectedhomeip/src/platform/android/AndroidPlatform.jar {root}/examples/tv-app/android/App/app/libs/AndroidPlatform.jar -cp {out}/android-arm64-chip-tvserver/lib/third_party/connectedhomeip/src/app/server/java/CHIPAppServer.jar {root}/examples/tv-app/App/app/libs/CHIPAppServer.jar +cp {out}/android-arm64-chip-tvserver/lib/third_party/connectedhomeip/src/app/server/java/CHIPAppServer.jar {root}/examples/tv-app/android/App/app/libs/CHIPAppServer.jar -cp {out}/android-arm64-chip-tvserver/lib/TvApp.jar {root}/examples/tv-app/App/app/libs/TvApp.jar +cp {out}/android-arm64-chip-tvserver/lib/TvApp.jar {root}/examples/tv-app/android/App/app/libs/TvApp.jar # Building Example android-arm64-chip-tvserver {root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-arm64-chip-tvserver -PmatterSdkSourceBuild=false -PbuildDir={out}/android-arm64-chip-tvserver assembleDebug diff --git a/scripts/examples/gn_android_example.sh b/scripts/examples/gn_android_example.sh index 1395403d3e045d..cbf301ee06bb76 100755 --- a/scripts/examples/gn_android_example.sh +++ b/scripts/examples/gn_android_example.sh @@ -67,8 +67,8 @@ if [ -z "$TARGET_CPU" ]; then fi # Set up JARs -python3 $(dirname "$0")/../../build/chip/java/tests/generate_jars_for_test.py -python3 $(dirname "$0")/../../third_party/android_deps/set_up_android_deps.py +python3 "$(dirname "$0")"/../../build/chip/java/tests/generate_jars_for_test.py +python3 "$(dirname "$0")"/../../third_party/android_deps/set_up_android_deps.py gn gen --check --fail-on-unused-args --root="$EXAMPLE_DIR" "$OUTPUT_DIR" --args="target_os=\"android\" target_cpu=\"$TARGET_CPU\" android_ndk_root=\"$ANDROID_NDK_HOME\" android_sdk_root=\"$ANDROID_HOME\" ${GN_ARGS[*]}" @@ -78,4 +78,4 @@ cp -rf "$OUTPUT_DIR/lib/jni/" "$EXAMPLE_DIR/App/app/libs/jniLibs/" cp -f "$OUTPUT_DIR/lib/third_party/connectedhomeip/src/platform/android/AndroidPlatform.jar" "$EXAMPLE_DIR/App/app/libs/" cp -f "$OUTPUT_DIR/lib/third_party/connectedhomeip/src/app/server/java/CHIPAppServer.jar" "$EXAMPLE_DIR/App/app/libs/" cp -f "$OUTPUT_DIR/lib/third_party/connectedhomeip/src/setup_payload/java/SetupPayloadParser.jar" "$EXAMPLE_DIR/App/app/libs/" -cp -f "$OUTPUT_DIR/lib/TvApp.jar" "$EXAMPLE_DIR/App/app/libs/" \ No newline at end of file +cp -f "$OUTPUT_DIR/lib/TvApp.jar" "$EXAMPLE_DIR/App/app/libs/" diff --git a/src/app/server/java/AndroidAppServerWrapper.h b/src/app/server/java/AndroidAppServerWrapper.h index 9b752ba9b56cd5..c128328564920c 100644 --- a/src/app/server/java/AndroidAppServerWrapper.h +++ b/src/app/server/java/AndroidAppServerWrapper.h @@ -24,4 +24,4 @@ CHIP_ERROR ChipAndroidAppInit(void); jint AndroidAppServerJNI_OnLoad(JavaVM * jvm, void * reserved); -void AndroidAppServerJNI_OnUnload(JavaVM * jvm, void * reserved); \ No newline at end of file +void AndroidAppServerJNI_OnUnload(JavaVM * jvm, void * reserved); diff --git a/src/app/server/java/BUILD.gn b/src/app/server/java/BUILD.gn index 7047ed32abdf61..dd40c94eaf1862 100644 --- a/src/app/server/java/BUILD.gn +++ b/src/app/server/java/BUILD.gn @@ -21,7 +21,7 @@ import("${chip_root}/src/app/common_flags.gni") import("${chip_root}/src/lib/lib.gni") static_library("jni") { - output_name = "libCHIPAppServer" + output_name = "libCHIPAppServerJni" sources = [ "AndroidAppServerWrapper.cpp",