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

Jump to bottom

Clean up Android test jars #17776

Merged
merged 1 commit into from
Apr 27, 2022
Merged

Clean up Android test jars #17776

merged 1 commit into from
Apr 27, 2022

Conversation

mspang
Copy link
Contributor

@mspang mspang commented Apr 26, 2022

Problem

This step is

  1. Building files in /tmp which isn't desirable, we should use the
    output dir
  2. Dirtying the inputs every time the script runs, causing
    unnecessary rebuilds.
  3. Not integrated with the bootstrap which is the expected place
    to run setup steps.

Change overview

These "prebuilt" test jars are smaller than most C++ sources. Just check
them in and remove this extra step.

Testing

After we get the expected "No work to do" from ninja the second time an
Android build is run.

@github-actions
Copy link

github-actions bot commented Apr 26, 2022 •
edited
Loading

PR #17776: Size comparison from 6c54ab8 to 18aaa2c

Full report (32 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 6c54ab8 18aaa2c change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 688215 688215 0 0.0
(read/write) 163824 163824 0 0.0
.bss 75020 75020 0 0.0
.data 3396 3396 0 0.0
.rodata 101583 101583 0 0.0
.text 586152 586152 0 0.0
lock-ftd LP_CC2652R7 (read only) 688783 688783 0 0.0
(read/write) 154568 154568 0 0.0
.bss 73388 73388 0 0.0
.data 3220 3220 0 0.0
.rodata 103175 103175 0 0.0
.text 585124 585124 0 0.0
lock-mtd LP_CC2652R7 (read only) 637535 637535 0 0.0
(read/write) 146188 146188 0 0.0
.bss 69108 69108 0 0.0
.data 3220 3220 0 0.0
.rodata 103055 103055 0 0.0
.text 533988 533988 0 0.0
pump-app LP_CC2652R7 (read only) 661635 661635 0 0.0
(read/write) 182916 182916 0 0.0
.bss 73564 73564 0 0.0
.data 3252 3252 0 0.0
.rodata 80371 80371 0 0.0
.text 580784 580784 0 0.0
pump-controller-app LP_CC2652R7 (read only) 654523 654523 0 0.0
(read/write) 189820 189820 0 0.0
.bss 73612 73612 0 0.0
.data 3216 3216 0 0.0
.rodata 83395 83395 0 0.0
.text 570648 570648 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 626770 626770 0 0.0
.app_xip_area 529648 529648 0 0.0
.bss 79780 79780 0 0.0
.data 692 692 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 621314 621314 0 0.0
.app_xip_area 525664 525664 0 0.0
.bss 78340 78340 0 0.0
.data 656 656 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 574150 574150 0 0.0
.app_xip_area 468856 468856 0 0.0
.bss 87688 87688 0 0.0
.data 568 568 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 907612 907612 0 0.0
(read/write) 134908 134908 0 0.0
.bss 132864 132864 0 0.0
.data 2044 2044 0 0.0
.text 907604 907604 0 0.0
BRD4161A+rpc (read only) 942028 942028 0 0.0
(read/write) 151592 151592 0 0.0
.bss 149344 149344 0 0.0
.data 2248 2248 0 0.0
.text 942020 942020 0 0.0
window-app BRD4161A (read only) 844996 844996 0 0.0
(read/write) 132996 132996 0 0.0
.bss 131040 131040 0 0.0
.data 1956 1956 0 0.0
.text 844988 844988 0 0.0
esp32 all-clusters-app c3devkit (read only) 999324 999324 0 0.0
(read/write) 1473618 1473618 0 0.0
.dram0.bss 68176 68176 0 0.0
.dram0.data 14428 14428 0 0.0
.flash.rodata 206568 206568 0 0.0
.flash.text 999324 999324 0 0.0
.iram0.text 62020 62020 0 0.0
m5stack (read only) 1053619 1053619 0 0.0
(read/write) 475616 475616 0 0.0
.dram0.bss 73696 73696 0 0.0
.dram0.data 34168 34168 0 0.0
.flash.rodata 235916 235916 0 0.0
.flash.text 1048235 1048235 0 0.0
.iram0.text 123107 123107 0 0.0
k32w light k32w061+release (read/write) 688712 688712 0 0.0
.bss 81112 81112 0 0.0
.data 2000 2000 0 0.0
.text 599800 599800 0 0.0
lock k32w061+release (read/write) 729572 729572 0 0.0
.bss 81520 81520 0 0.0
.data 1960 1960 0 0.0
.text 640292 640292 0 0.0
linux all-clusters-app debug (read only) 2734441 2734441 0 0.0
(read/write) 172808 172808 0 0.0
.bss 83168 83168 0 0.0
.data 1984 1984 0 0.0
.data.rel.ro 81576 81576 0 0.0
.dynamic 608 608 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 992 992 0 0.0
.rodata 233797 233797 0 0.0
.text 2326018 2326018 0 0.0
bridge-app debug+rpc (read only) 1890425 1890425 0 0.0
(read/write) 120240 120240 0 0.0
.bss 71168 71168 0 0.0
.data 3424 3424 0 0.0
.data.rel.ro 40328 40328 0 0.0
.dynamic 592 592 0 0.0
.got 4032 4032 0 0.0
.init 27 27 0 0.0
.init_array 680 680 0 0.0
.rodata 159537 159537 0 0.0
.text 1608322 1608322 0 0.0
chip-tool debug (read only) 8359621 8359621 0 0.0
(read/write) 472624 472624 0 0.0
.bss 22592 22592 0 0.0
.data 1136 1136 0 0.0
.data.rel.ro 442648 442648 0 0.0
.dynamic 624 624 0 0.0
.got 4952 4952 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 452949 452949 0 0.0
.text 6825109 6825109 0 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 8221580 8221580 0 0.0
(read/write) 537745 537745 0 0.0
.bss 40897 40897 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 477752 477752 0 0.0
.dynamic 560 560 0 0.0
.got 14080 14080 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 419388 419388 0 0.0
.text 6588244 6588244 0 0.0
lighting-app debug+rpc (read only) 2325881 2325881 0 0.0
(read/write) 151192 151192 0 0.0
.bss 73216 73216 0 0.0
.data 1984 1984 0 0.0
.data.rel.ro 70248 70248 0 0.0
.dynamic 608 608 0 0.0
.got 4320 4320 0 0.0
.init 27 27 0 0.0
.init_array 784 784 0 0.0
.rodata 183633 183633 0 0.0
.text 1975826 1975826 0 0.0
lock-app debug (read only) 2206265 2206265 0 0.0
(read/write) 145576 145576 0 0.0
.bss 71808 71808 0 0.0
.data 1504 1504 0 0.0
.data.rel.ro 66600 66600 0 0.0
.dynamic 592 592 0 0.0
.got 4312 4312 0 0.0
.init 27 27 0 0.0
.init_array 736 736 0 0.0
.rodata 192129 192129 0 0.0
.text 1854354 1854354 0 0.0
ota-provider-app debug (read only) 2059001 2059001 0 0.0
(read/write) 138824 138824 0 0.0
.bss 71232 71232 0 0.0
.data 1672 1672 0 0.0
.data.rel.ro 60152 60152 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 174171 174171 0 0.0
.text 1727538 1727538 0 0.0
ota-requestor-app debug (read only) 2090217 2090217 0 0.0
(read/write) 141600 141600 0 0.0
.bss 71872 71872 0 0.0
.data 1928 1928 0 0.0
.data.rel.ro 62184 62184 0 0.0
.dynamic 592 592 0 0.0
.got 4320 4320 0 0.0
.init 27 27 0 0.0
.init_array 664 664 0 0.0
.rodata 170492 170492 0 0.0
.text 1760946 1760946 0 0.0
shell debug (read only) 2560257 2560257 0 0.0
(read/write) 196776 196776 0 0.0
.bss 113768 113768 0 0.0
.data 1360 1360 0 0.0
.data.rel.ro 75912 75912 0 0.0
.dynamic 592 592 0 0.0
.got 4184 4184 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 215538 215538 0 0.0
.text 2183026 2183026 0 0.0
thermostat-no-ble arm64 (read only) 2367676 2367676 0 0.0
(read/write) 174337 174337 0 0.0
.bss 86097 86097 0 0.0
.data 1488 1488 0 0.0
.data.rel.ro 78984 78984 0 0.0
.dynamic 560 560 0 0.0
.got 4744 4744 0 0.0
.init 24 24 0 0.0
.init_array 368 368 0 0.0
.rodata 145468 145468 0 0.0
.text 1993184 1993184 0 0.0
tv-app debug (read only) 2844401 2844401 0 0.0
(read/write) 276472 276472 0 0.0
.bss 189112 189112 0 0.0
.data 4640 4640 0 0.0
.data.rel.ro 76488 76488 0 0.0
.dynamic 592 592 0 0.0
.got 4696 4696 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 215947 215947 0 0.0
.text 2446210 2446210 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2411508 2411508 0 0.0
.bss 205660 205660 0 0.0
.data 5848 5848 0 0.0
.text 1374108 1374108 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1179243 1179243 0 0.0
bss 141784 141784 0 0.0
rodata 150204 150204 0 0.0
text 808616 808616 0 0.0
p6 all-clusters-app default (read/write) 2526920 2526920 0 0.0
.bss 139040 139040 0 0.0
.data 2784 2784 0 0.0
.text 1485184 1485184 0 0.0
light-app default (read/write) 2418680 2418680 0 0.0
.bss 132520 132520 0 0.0
.data 2584 2584 0 0.0
.text 1376944 1376944 0 0.0
lock-app default (read/write) 2422856 2422856 0 0.0
.bss 132320 132320 0 0.0
.data 2544 2544 0 0.0
.text 1381120 1381120 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 807864 807864 0 0.0
bss 75216 75216 0 0.0
noinit 40416 40416 0 0.0
text 571682 571682 0 0.0

@pullapprove pullapprove bot requested a review from lzgrablic02 April 26, 2022 20:37
@mspang
Clean up Android test jars
93a2b3a 
This step is

1) Building files in /tmp which isn't desirable, we should use the
   output dir
2) Dirtying the inputs every time the script runs, causing
   unnecessary rebuilds.
3) Not integrated with the bootstrap which is the expected place
   to run setup steps.

These "prebuilt" test jars are smaller than most C++ sources. Just check
them in and remove this extra step.

After we get the expected "No work to do" from ninja the second time an
Android build is run.
@mspang mspang force-pushed the for-chip/fix-android-jar branch from 18aaa2c to 93a2b3a Compare April 26, 2022 21:43
@pullapprove pullapprove bot requested review from robszewczyk and removed request for lzgrablic02 and austinh0 April 26, 2022 21:43
@github-actions
Copy link

github-actions bot commented Apr 26, 2022 •
edited
Loading

PR #17776: Size comparison from 6c54ab8 to 93a2b3a

Full report (16 builds for cc13x2_26x2, efr32, esp32, mbed, nrfconnect, p6, telink)
platform target config section 6c54ab8 93a2b3a change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 688215 688215 0 0.0
(read/write) 163824 163824 0 0.0
.bss 75020 75020 0 0.0
.data 3396 3396 0 0.0
.rodata 101583 101583 0 0.0
.text 586152 586152 0 0.0
lock-ftd LP_CC2652R7 (read only) 688783 688783 0 0.0
(read/write) 154568 154568 0 0.0
.bss 73388 73388 0 0.0
.data 3220 3220 0 0.0
.rodata 103175 103175 0 0.0
.text 585124 585124 0 0.0
lock-mtd LP_CC2652R7 (read only) 637535 637535 0 0.0
(read/write) 146188 146188 0 0.0
.bss 69108 69108 0 0.0
.data 3220 3220 0 0.0
.rodata 103055 103055 0 0.0
.text 533988 533988 0 0.0
pump-app LP_CC2652R7 (read only) 661635 661635 0 0.0
(read/write) 182916 182916 0 0.0
.bss 73564 73564 0 0.0
.data 3252 3252 0 0.0
.rodata 80371 80371 0 0.0
.text 580784 580784 0 0.0
pump-controller-app LP_CC2652R7 (read only) 654523 654523 0 0.0
(read/write) 189820 189820 0 0.0
.bss 73612 73612 0 0.0
.data 3216 3216 0 0.0
.rodata 83395 83395 0 0.0
.text 570648 570648 0 0.0
efr32 lighting-app BRD4161A (read only) 907612 907612 0 0.0
(read/write) 134908 134908 0 0.0
.bss 132864 132864 0 0.0
.data 2044 2044 0 0.0
.text 907604 907604 0 0.0
BRD4161A+rpc (read only) 942028 942028 0 0.0
(read/write) 151592 151592 0 0.0
.bss 149344 149344 0 0.0
.data 2248 2248 0 0.0
.text 942020 942020 0 0.0
window-app BRD4161A (read only) 844996 844996 0 0.0
(read/write) 132996 132996 0 0.0
.bss 131040 131040 0 0.0
.data 1956 1956 0 0.0
.text 844988 844988 0 0.0
esp32 all-clusters-app c3devkit (read only) 999324 999324 0 0.0
(read/write) 1473618 1473618 0 0.0
.dram0.bss 68176 68176 0 0.0
.dram0.data 14428 14428 0 0.0
.flash.rodata 206568 206568 0 0.0
.flash.text 999324 999324 0 0.0
.iram0.text 62020 62020 0 0.0
m5stack (read only) 1053619 1053619 0 0.0
(read/write) 475616 475616 0 0.0
.dram0.bss 73696 73696 0 0.0
.dram0.data 34168 34168 0 0.0
.flash.rodata 235916 235916 0 0.0
.flash.text 1048235 1048235 0 0.0
.iram0.text 123107 123107 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2411508 2411508 0 0.0
.bss 205660 205660 0 0.0
.data 5848 5848 0 0.0
.text 1374108 1374108 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1179243 1179243 0 0.0
bss 141784 141784 0 0.0
rodata 150204 150204 0 0.0
text 808616 808616 0 0.0
p6 all-clusters-app default (read/write) 2526920 2526920 0 0.0
.bss 139040 139040 0 0.0
.data 2784 2784 0 0.0
.text 1485184 1485184 0 0.0
light-app default (read/write) 2418680 2418680 0 0.0
.bss 132520 132520 0 0.0
.data 2584 2584 0 0.0
.text 1376944 1376944 0 0.0
lock-app default (read/write) 2422856 2422856 0 0.0
.bss 132320 132320 0 0.0
.data 2544 2544 0 0.0
.text 1381120 1381120 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 807864 807864 0 0.0
bss 75216 75216 0 0.0
noinit 40416 40416 0 0.0
text 571682 571682 0 0.0

@Damian-Nordic Damian-Nordic merged commit 10afdab into project-chip:master Apr 27, 2022
@mspang mspang deleted the for-chip/fix-android-jar branch April 27, 2022 14:29
@DoggyBadBoy DoggyBadBoy mentioned this pull request Dec 27, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Damian-Nordic Damian-Nordic Damian-Nordic approved these changes

@bzbarsky-apple bzbarsky-apple bzbarsky-apple approved these changes

@andy31415 andy31415 Awaiting requested review from andy31415

@anush-apple anush-apple Awaiting requested review from anush-apple

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@carol-apple carol-apple Awaiting requested review from carol-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@hawk248 hawk248 Awaiting requested review from hawk248

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@kghost kghost Awaiting requested review from kghost

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

Assignees
No one assigned
Labels
review - approved scripts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mspang @bzbarsky-apple @Damian-Nordic