Skip to content

Commit

Permalink
Fixing build
Browse files Browse the repository at this point in the history
  • Loading branch information
sharadb-amazon committed Apr 12, 2024
1 parent bdca786 commit 2373630
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 28 deletions.
2 changes: 2 additions & 0 deletions scripts/build/testdata/dry_run_android-arm64-chip-tool.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ cp {out}/android-arm64-chip-tool/lib/jni/arm64-v8a/libc++_shared.so {root}/examp

cp {out}/android-arm64-chip-tool/lib/src/controller/java/CHIPController.jar {root}/examples/android/CHIPTool/app/libs/CHIPController.jar

cp {out}/android-arm64-chip-tool/lib/src/controller/java/CHIPInteractionModel.jar {root}/examples/android/CHIPTool/app/libs/CHIPInteractionModel.jar

cp {out}/android-arm64-chip-tool/lib/src/controller/java/OnboardingPayload.jar {root}/examples/android/CHIPTool/app/libs/OnboardingPayload.jar

cp {out}/android-arm64-chip-tool/lib/src/platform/android/AndroidPlatform.jar {root}/examples/android/CHIPTool/app/libs/AndroidPlatform.jar
Expand Down
38 changes: 10 additions & 28 deletions src/controller/java/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,16 @@ source_set("android_chip_im_jni") {
deps = [
"${chip_root}/src/lib",
"${chip_root}/src/lib/support/jsontlv",
"${chip_root}/src/platform",
]

if (current_os == "mac") {
ldflags = [ "-Wl,-dead_strip" ]
} else {
ldflags = [ "-Wl,--gc-sections" ]
}

public_configs = [ "${chip_root}/src:includes" ]
}

shared_library("jni") {
Expand Down Expand Up @@ -124,16 +133,6 @@ shared_library("jni") {
"${chip_root}/src/platform",
]

if (matter_enable_tlv_decoder_api) {
defines += [ "USE_JAVA_TLV_ENCODE_DECODE" ]

sources += [
"CHIPTLVValueDecoder-JNI.cpp",
"zap-generated/CHIPAttributeTLVValueDecoder.cpp",
"zap-generated/CHIPEventTLVValueDecoder.cpp",
]
}

if (chip_build_controller_dynamic_server) {
sources += [
"BdxOTASender.cpp",
Expand Down Expand Up @@ -197,6 +196,7 @@ if (chip_link_tests) {
public_configs = [ "${chip_root}/src:includes" ]

deps = [
":android_chip_im_jni",
":jni",
"${chip_root}/src/messaging/tests:helpers",
]
Expand Down Expand Up @@ -632,24 +632,6 @@ android_library("java") {
sources += [ "src/chip/devicecontroller/ChipTLVValueDecoder.java" ]
}

if (matter_enable_java_generated_api) {
sources += [
"generated/java/chip/devicecontroller/ChipClusters.java",
"generated/java/chip/devicecontroller/ChipEventStructs.java",
"generated/java/chip/devicecontroller/ChipStructs.java",
"generated/java/chip/devicecontroller/ClusterInfoMapping.java",
"generated/java/chip/devicecontroller/ClusterReadMapping.java",
"generated/java/chip/devicecontroller/ClusterWriteMapping.java",
"src/chip/clusterinfo/ClusterCommandCallback.java",
"src/chip/clusterinfo/ClusterInfo.java",
"src/chip/clusterinfo/CommandParameterInfo.java",
"src/chip/clusterinfo/CommandResponseInfo.java",
"src/chip/clusterinfo/DelegatedClusterCallback.java",
"src/chip/clusterinfo/InteractionInfo.java",
"src/chip/devicecontroller/ChipTLVType.java",
]
}

if (matter_enable_java_compilation) {
deps += [
"${chip_root}/third_party/java_deps:json",
Expand Down

0 comments on commit 2373630

Please sign in to comment.