Skip to content

Commit 10e8482

Browse files
q-thlapull[bot]
authored andcommitted
qpg: build libFactoryData instead of using an artifact (#26449)
Instead of using a static factory data blob, use a freshly build libfactorydata.a so any changes to .factory_data_config file or its input files are picked up by the GN build.
1 parent 5197995 commit 10e8482

File tree

3 files changed

+43
-26
lines changed

3 files changed

+43
-26
lines changed

examples/lighting-app/qpg/BUILD.gn

+1-13
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ qpg_executable("lighting_app") {
6464
]
6565

6666
deps = [
67-
":factorydata_lib",
6867
":sdk",
6968
"${chip_root}/examples/lighting-app/lighting-common:color-format",
7069
"${chip_root}/examples/lighting-app/qpg/zap/",
@@ -73,6 +72,7 @@ qpg_executable("lighting_app") {
7372
"${chip_root}/src/setup_payload",
7473
"${chip_root}/third_party/openthread/platforms:libopenthread-platform",
7574
"${chip_root}/third_party/openthread/platforms:libopenthread-platform-utils",
75+
"${chip_root}/third_party/qpg_sdk:qpg_light_factorydata_lib",
7676
]
7777

7878
if (chip_openthread_ftd) {
@@ -156,15 +156,3 @@ group("qpg") {
156156
group("default") {
157157
deps = [ ":qpg" ]
158158
}
159-
160-
static_library("factorydata_lib") {
161-
libs = [ "${qpg_sdk_root}/Binaries/FactoryData/FactoryData_example/FactoryData_example.a" ]
162-
public_configs = [ ":qpg_retain_factorydata" ]
163-
}
164-
165-
config("qpg_retain_factorydata") {
166-
ldflags = [
167-
"-Wl,-u_binary_factory_data_bin_start",
168-
"-Wl,-u_binary_factory_data_start",
169-
]
170-
}

examples/lock-app/qpg/BUILD.gn

+1-13
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ qpg_executable("lock_app") {
6262
]
6363

6464
deps = [
65-
":factorydata_lib",
6665
":sdk",
6766
"${chip_root}/examples/lock-app/qpg/zap/",
6867
"${chip_root}/examples/providers:device_info_provider",
6968
"${chip_root}/src/lib",
7069
"${chip_root}/src/setup_payload",
7170
"${chip_root}/third_party/openthread/platforms:libopenthread-platform",
7271
"${chip_root}/third_party/openthread/platforms:libopenthread-platform-utils",
72+
"${chip_root}/third_party/qpg_sdk:qpg_lock_factorydata_lib",
7373
]
7474

7575
if (chip_openthread_ftd) {
@@ -153,15 +153,3 @@ group("qpg") {
153153
group("default") {
154154
deps = [ ":qpg" ]
155155
}
156-
157-
static_library("factorydata_lib") {
158-
libs = [ "${qpg_sdk_root}/Binaries/FactoryData/FactoryData_example/FactoryData_example.a" ]
159-
public_configs = [ ":qpg_retain_factorydata" ]
160-
}
161-
162-
config("qpg_retain_factorydata") {
163-
ldflags = [
164-
"-Wl,-u_binary_factory_data_bin_start",
165-
"-Wl,-u_binary_factory_data_start",
166-
]
167-
}

third_party/qpg_sdk/BUILD.gn

+41
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,44 @@ static_library("qpg_openthread_glue_lib") {
193193
deps = [ "${chip_root}/third_party/qpg_sdk:qpg_openthread_glue" ]
194194
libs = [ "${target_gen_dir}/${qpg_sdk_lib_dir}/OpenThreadQorvoGlue_qpg6105_ftd/libOpenThreadQorvoGlue_${qpg_target_ic}_ftd.a" ]
195195
}
196+
197+
qpg_make_build("qpg_light_factorydata") {
198+
make_sources = [ "${qpg_sdk_root}/Tools/FactoryData" ]
199+
make_output = [ "${target_gen_dir}/${qpg_sdk_lib_dir}/FactoryData_light_static_pake/libFactoryData_light_static_pake.a" ]
200+
make_args = [
201+
"-f",
202+
rebase_path(qpg_sdk_root, root_build_dir) +
203+
"/Libraries/Qorvo/FactoryData/Makefile.FactoryData_light_static_pake",
204+
"WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) +
205+
"/${qpg_sdk_lib_dir}/FactoryData_light_static_pake",
206+
]
207+
}
208+
static_library("qpg_light_factorydata_lib") {
209+
deps = [ "${chip_root}/third_party/qpg_sdk:qpg_light_factorydata" ]
210+
libs = [ "${target_gen_dir}/${qpg_sdk_lib_dir}/FactoryData_light_static_pake/libFactoryData_light_static_pake.a" ]
211+
public_configs = [ ":qpg_retain_factorydata" ]
212+
}
213+
214+
qpg_make_build("qpg_lock_factorydata") {
215+
make_sources = [ "${qpg_sdk_root}/Tools/FactoryData" ]
216+
make_output = [ "${target_gen_dir}/${qpg_sdk_lib_dir}/FactoryData_lock_static_pake/libFactoryData_lock_static_pake.a" ]
217+
make_args = [
218+
"-f",
219+
rebase_path(qpg_sdk_root, root_build_dir) +
220+
"/Libraries/Qorvo/FactoryData/Makefile.FactoryData_lock_static_pake",
221+
"WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) +
222+
"/${qpg_sdk_lib_dir}/FactoryData_lock_static_pake",
223+
]
224+
}
225+
static_library("qpg_lock_factorydata_lib") {
226+
deps = [ "${chip_root}/third_party/qpg_sdk:qpg_lock_factorydata" ]
227+
libs = [ "${target_gen_dir}/${qpg_sdk_lib_dir}/FactoryData_lock_static_pake/libFactoryData_lock_static_pake.a" ]
228+
public_configs = [ ":qpg_retain_factorydata" ]
229+
}
230+
231+
config("qpg_retain_factorydata") {
232+
ldflags = [
233+
"-Wl,-u_binary_factory_data_bin_start",
234+
"-Wl,-u_binary_factory_data_start",
235+
]
236+
}

0 commit comments

Comments
 (0)