Skip to content

Commit 1028578

Browse files
yufengwangcapull[bot]
authored andcommitted
Cleanup obsolete build steps for java-matter-controller (#25170)
1 parent a2a384e commit 1028578

File tree

1 file changed

+1
-53
lines changed

1 file changed

+1
-53
lines changed

scripts/build/builders/android.py

+1-53
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ def AppName(self):
8181
return "tv-server"
8282
elif self == AndroidApp.TV_CASTING_APP:
8383
return "tv-casting"
84-
elif self == AndroidApp.JAVA_MATTER_CONTROLLER:
85-
return "java-matter-controller"
8684
else:
8785
raise Exception("Unknown app type: %r" % self)
8886

@@ -99,8 +97,6 @@ def ExampleName(self):
9997
return "tv-app"
10098
elif self == AndroidApp.TV_CASTING_APP:
10199
return "tv-casting-app"
102-
elif self == AndroidApp.JAVA_MATTER_CONTROLLER:
103-
return "java-matter-controller"
104100
else:
105101
return None
106102

@@ -294,16 +290,6 @@ def gradlewBuildExampleAndroid(self):
294290
title="Building Example " + self.identifier,
295291
)
296292

297-
def createJavaExecutable(self, java_program):
298-
self._Execute(
299-
[
300-
"chmod",
301-
"+x",
302-
"%s/bin/%s" % (self.output_dir, java_program),
303-
],
304-
title="Make Java program executable",
305-
)
306-
307293
def generate(self):
308294
self._Execute(
309295
["python3", "third_party/android_deps/set_up_android_deps.py"],
@@ -349,10 +335,7 @@ def generate(self):
349335

350336
exampleName = self.app.ExampleName()
351337
if exampleName is not None:
352-
if exampleName == "java-matter-controller":
353-
gn_gen += ["--root=%s/examples/%s/" % (self.root, exampleName)]
354-
else:
355-
gn_gen += ["--root=%s/examples/%s/android/" % (self.root, exampleName)]
338+
gn_gen += ["--root=%s/examples/%s/android/" % (self.root, exampleName)]
356339

357340
if self.board.IsIde():
358341
gn_gen += [
@@ -384,15 +367,6 @@ def generate(self):
384367
)
385368

386369
app_dir = os.path.join(self.root, "examples/", self.app.AppName())
387-
if exampleName == "java-matter-controller":
388-
self._Execute(
389-
[
390-
"cp",
391-
os.path.join(app_dir, "Manifest.txt"),
392-
self.output_dir,
393-
],
394-
title="Copying Manifest.txt to " + self.output_dir,
395-
)
396370

397371
def _build(self):
398372
if self.board.IsIde():
@@ -420,32 +394,6 @@ def _build(self):
420394
if exampleName is None:
421395
self.copyToSrcAndroid()
422396
self.gradlewBuildSrcAndroid()
423-
elif exampleName == "java-matter-controller":
424-
jnilibs_dir = os.path.join(
425-
self.root,
426-
"examples/",
427-
self.app.ExampleName(),
428-
"app/libs/jniLibs",
429-
self.board.AbiName(),
430-
)
431-
432-
libs_dir = os.path.join(
433-
self.root, "examples/", self.app.ExampleName(), "app/libs"
434-
)
435-
436-
libs = [
437-
"libSetupPayloadParser.so",
438-
"libCHIPController.so",
439-
"libc++_shared.so",
440-
]
441-
442-
jars = {
443-
"CHIPController.jar": "third_party/connectedhomeip/src/controller/java/CHIPController.jar",
444-
"SetupPayloadParser.jar": "third_party/connectedhomeip/src/setup_payload/java/SetupPayloadParser.jar",
445-
}
446-
447-
self.copyToExampleApp(jnilibs_dir, libs_dir, libs, jars)
448-
self.createJavaExecutable("java-matter-controller")
449397
elif exampleName == "tv-casting-app":
450398
jnilibs_dir = os.path.join(
451399
self.root,

0 commit comments

Comments
 (0)