@@ -81,8 +81,6 @@ def AppName(self):
81
81
return "tv-server"
82
82
elif self == AndroidApp .TV_CASTING_APP :
83
83
return "tv-casting"
84
- elif self == AndroidApp .JAVA_MATTER_CONTROLLER :
85
- return "java-matter-controller"
86
84
else :
87
85
raise Exception ("Unknown app type: %r" % self )
88
86
@@ -99,8 +97,6 @@ def ExampleName(self):
99
97
return "tv-app"
100
98
elif self == AndroidApp .TV_CASTING_APP :
101
99
return "tv-casting-app"
102
- elif self == AndroidApp .JAVA_MATTER_CONTROLLER :
103
- return "java-matter-controller"
104
100
else :
105
101
return None
106
102
@@ -294,16 +290,6 @@ def gradlewBuildExampleAndroid(self):
294
290
title = "Building Example " + self .identifier ,
295
291
)
296
292
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
-
307
293
def generate (self ):
308
294
self ._Execute (
309
295
["python3" , "third_party/android_deps/set_up_android_deps.py" ],
@@ -349,10 +335,7 @@ def generate(self):
349
335
350
336
exampleName = self .app .ExampleName ()
351
337
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 )]
356
339
357
340
if self .board .IsIde ():
358
341
gn_gen += [
@@ -384,15 +367,6 @@ def generate(self):
384
367
)
385
368
386
369
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
- )
396
370
397
371
def _build (self ):
398
372
if self .board .IsIde ():
@@ -420,32 +394,6 @@ def _build(self):
420
394
if exampleName is None :
421
395
self .copyToSrcAndroid ()
422
396
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" )
449
397
elif exampleName == "tv-casting-app" :
450
398
jnilibs_dir = os .path .join (
451
399
self .root ,
0 commit comments