Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move Tvserver to examples #11780

Merged
merged 6 commits into from
Nov 17, 2021
Merged

Move Tvserver to examples #11780

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
971c995
move share lib and tv-common(zzz_generated/tv-app/zap-generated) link…
xylophone21 Nov 15, 2021
f0f6071
make it buildable under example
xylophone21 Nov 15, 2021
7e5e40a
move CHIPTVServer to examples/tv-app/android
xylophone21 Nov 15, 2021
9aa59f9
fix runtime issue, force load jni before using AndroidChipPlatform
xylophone21 Nov 15, 2021
57b84f8
change build_example.py for new app struct
xylophone21 Nov 15, 2021
f7ddab7
fix restyled-io and ci issues
xylophone21 Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
change build_example.py for new app struct
  • Loading branch information
@xylophone21
xylophone21 committed Nov 17, 2021
commit 57b84f857437f37f4f04dd77835bd6fcc7d9180e
1 change: 0 additions & 1 deletion examples/tv-app/android/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import("${build_root}/config/android_abi.gni")
import("${chip_root}/build/chip/java/rules.gni")
import("${chip_root}/build/chip/tools.gni")

# Todo: copy from examples/tv-app/linux but later will be moved to jni and upto java word
shared_library("jni") {

output_name = "libTvApp"
Expand Down
178 changes: 118 additions & 60 deletions scripts/build/builders/android.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ def AppGnArgs(self):
gn_args['chip_config_network_layer_ble'] = False
return gn_args

def ExampleName(self):
if self == AndroidApp.CHIP_TVServer:
return "tv-app"
else:
return None


class AndroidBuilder(Builder):

Expand Down Expand Up @@ -124,6 +130,92 @@ def validate_build_environment(self):
"'%s' is NOT writable by the current user (needed to accept licenses)"
% licenses)

def copyToSrcAndroid(self):
# JNILibs will be copied as long as they reside in src/main/jniLibs/ABI:
# https://developer.android.com/studio/projects/gradle-external-native-builds#jniLibs
# to avoid redefined in IDE mode, copy to another place and add that path in build.gradle

# We do NOT use python builtins for copy, so that the 'execution commands' are available
# when using dry run.
jnilibs_dir = os.path.join(
self.root, 'src/android/', self.app.AppName(), 'app/libs/jniLibs', self.board.AbiName())
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)

# TODO: Runtime dependencies should be computed by the build system rather than hardcoded
# GN supports getting these dependencies like:
# gn desc out/android-x64-chip_tool/ //src/controller/java runtime_deps
# gn desc out/android-x64-chip_tool/ //src/setup_payload/java runtime_deps
# However this assumes that the output folder has been populated, which will not be
# the case for `dry-run` executions. Hence this harcoding here.
#
# If we unify the JNI libraries, libc++_shared.so may not be needed anymore, which could
# be another path of resolving this inconsistency.
for libName in ['libSetupPayloadParser.so', 'libCHIPController.so', 'libc++_shared.so']:
self._Execute(['cp', os.path.join(self.output_dir, 'lib', 'jni', self.board.AbiName(
), libName), os.path.join(jnilibs_dir, libName)])

jars = {
'CHIPController.jar': 'src/controller/java/CHIPController.jar',
'SetupPayloadParser.jar': 'src/setup_payload/java/SetupPayloadParser.jar',
'AndroidPlatform.jar': 'src/platform/android/AndroidPlatform.jar',
}

for jarName in jars.keys():
self._Execute(['cp', os.path.join(
self.output_dir, 'lib', jars[jarName]), os.path.join(libs_dir, jarName)])

def copyToExampleAndroid(self):
jnilibs_dir = os.path.join(
self.root, 'examples', self.app.ExampleName(), 'android/App/app/libs/jniLibs', self.board.AbiName())
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)

for libName in ['libSetupPayloadParser.so', 'libc++_shared.so', 'libTvApp.so']:
self._Execute(['cp', os.path.join(self.output_dir, 'lib', 'jni', self.board.AbiName(
), libName), os.path.join(jnilibs_dir, libName)])

jars = {
'SetupPayloadParser.jar': 'third_party/connectedhomeip/src/setup_payload/java/SetupPayloadParser.jar',
'AndroidPlatform.jar': 'third_party/connectedhomeip/src/platform/android/AndroidPlatform.jar',
'CHIPAppServer.jar': 'third_party/connectedhomeip/src/app/server/java/CHIPAppServer.jar',
'TvApp.jar': 'TvApp.jar',
}

for jarName in jars.keys():
self._Execute(['cp', os.path.join(
self.output_dir, 'lib', jars[jarName]), os.path.join(libs_dir, jarName)])

def gradlewBuildSrcAndroid(self):
# App compilation
self._Execute([
'%s/src/android/%s/gradlew' % (self.root,
self.app.AppName()), '-p',
'%s/src/android/%s' % (self.root,
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',
'%s/examples/%s/android/App/' % (self.root,
self.app.ExampleName()),
'-PmatterBuildSrcDir=%s' % self.output_dir,
'-PmatterSdkSourceBuild=false',
'-PbuildDir=%s' % self.output_dir, 'assembleDebug'
],
title='Building Example ' + self.identifier)

def generate(self):
self._Execute([
'python3', 'build/chip/java/tests/generate_jars_for_test.py'
Expand Down Expand Up @@ -159,6 +251,11 @@ def generate(self):
gn_gen = [
'gn', 'gen', '--check', '--fail-on-unused-args', self.output_dir, args,
]

exampleName = self.app.ExampleName()
if exampleName is not None:
gn_gen += ['--root=%s/examples/%s/android/' % (self.root, exampleName)]

if self.board.IsIde():
gn_gen += ['--ide=json',
'--json-ide-script=//scripts/examples/gn_to_cmakelists.py']
Expand Down Expand Up @@ -201,59 +298,29 @@ def _build(self):
else:
self._Execute(['ninja', '-C', self.output_dir],
title='Building JNI ' + self.identifier)

# JNILibs will be copied as long as they reside in src/main/jniLibs/ABI:
# https://developer.android.com/studio/projects/gradle-external-native-builds#jniLibs
# to avoid redefined in IDE mode, copy to another place and add that path in build.gradle

# We do NOT use python builtins for copy, so that the 'execution commands' are available
# when using dry run.
jnilibs_dir = os.path.join(
self.root, 'src/android/', self.app.AppName(), 'app/libs/jniLibs', self.board.AbiName())
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)

# TODO: Runtime dependencies should be computed by the build system rather than hardcoded
# GN supports getting these dependencies like:
# gn desc out/android-x64-chip_tool/ //src/controller/java runtime_deps
# gn desc out/android-x64-chip_tool/ //src/setup_payload/java runtime_deps
# However this assumes that the output folder has been populated, which will not be
# the case for `dry-run` executions. Hence this harcoding here.
#
# If we unify the JNI libraries, libc++_shared.so may not be needed anymore, which could
# be another path of resolving this inconsistency.
for libName in ['libSetupPayloadParser.so', 'libCHIPController.so', 'libc++_shared.so', 'libTvApp.so']:
self._Execute(['cp', os.path.join(self.output_dir, 'lib', 'jni', self.board.AbiName(
), libName), os.path.join(jnilibs_dir, libName)])

jars = {
'CHIPController.jar': 'src/controller/java/CHIPController.jar',
'SetupPayloadParser.jar': 'src/setup_payload/java/SetupPayloadParser.jar',
'AndroidPlatform.jar': 'src/platform/android/AndroidPlatform.jar',
'CHIPAppServer.jar': 'src/app/server/java/CHIPAppServer.jar',
'TvApp.jar': 'examples/tv-app/android/TvApp.jar',
}

for jarName in jars.keys():
self._Execute(['cp', os.path.join(
self.output_dir, 'lib', jars[jarName]), os.path.join(libs_dir, jarName)])

# App compilation
self._Execute([
'%s/src/android/%s/gradlew' % (self.root,
self.app.AppName()), '-p',
'%s/src/android/%s' % (self.root,
self.app.AppName()),
'-PmatterBuildSrcDir=%s' % self.output_dir,
'-PmatterSdkSourceBuild=false',
'-PbuildDir=%s' % self.output_dir, 'assembleDebug'
],
title='Building APP ' + self.identifier)

exampleName = self.app.ExampleName()
if exampleName is None:
self.copyToSrcAndroid()
self.gradlewBuildSrcAndroid()
else:
self.copyToExampleAndroid()
self.gradlewBuildExampleAndroid()

def build_outputs(self):
if not self.board.IsIde():
if self.board.IsIde():
outputs = {
self.app.AppName() + '-debug.apk':
os.path.join(self.root, "src/android", self.app.AppName(),
'app/build/outputs/apk/debug/app-debug.apk')
}
elif self.app.ExampleName() is not None:
outputs = {
self.app.AppName() + 'app-debug.apk':
os.path.join(self.output_dir, 'outputs', 'apk', 'debug',
'app-debug.apk')
}
else:
outputs = {
self.app.AppName() + 'app-debug.apk':
os.path.join(self.output_dir, 'outputs', 'apk', 'debug',
Expand All @@ -267,9 +334,6 @@ def build_outputs(self):
'SetupPayloadParser.jar':
os.path.join(self.output_dir, 'lib',
'src/setup_payload/java/SetupPayloadParser.jar'),
'CHIPAppServer.jar':
os.path.join(self.output_dir, 'lib',
'src/app/server/java/CHIPAppServer.jar'),

'jni/%s/libSetupPayloadParser.so' % self.board.AbiName():
os.path.join(self.output_dir, 'lib', 'jni',
Expand All @@ -281,11 +345,5 @@ def build_outputs(self):
os.path.join(self.output_dir, 'lib', 'jni',
self.board.AbiName(), 'libc++_shared.so'),
}
else:
outputs = {
self.app.AppName() + '-debug.apk':
os.path.join(self.root, "src/android", self.app.AppName(),
'app/build/outputs/apk/debug/app-debug.apk')
}

return outputs
Loading