Commit Graph

10026 Commits

Author SHA1 Message Date
Wei Li
1911f735a4 Merge "Extract class MetadataDb to a separate python library so it can be used in notice files generation." into main am: eda61c1a85 am: 93f32d1d5e
Original change: https://android-review.googlesource.com/c/platform/build/+/3277554

Change-Id: I6a690da843200cee9c9b6979672c7f6d2239a80e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-24 00:19:26 +00:00
Zhuoyao Zhang
cc877453a1 Merge "Ensure a single running instance of edit monitor" into main am: 549513a4ab am: 2e7473f31a
Original change: https://android-review.googlesource.com/c/platform/build/+/3270767

Change-Id: I45029c27abfb063722dda6652ad206b8cea97820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-24 00:18:32 +00:00
Wei Li
eda61c1a85 Merge "Extract class MetadataDb to a separate python library so it can be used in notice files generation." into main 2024-09-23 23:23:43 +00:00
Zhuoyao Zhang
549513a4ab Merge "Ensure a single running instance of edit monitor" into main 2024-09-23 23:05:50 +00:00
Marybeth Fair
01e1e1f886 Merge "Revert "Add fingerprint to packages.map."" into main am: 1127718899 am: e61e7bdb4a
Original change: https://android-review.googlesource.com/c/platform/build/+/3277272

Change-Id: Ib434845a48bf6f8708e745cbc7729ffe3b9dfcea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-23 22:40:27 +00:00
Zhuoyao Zhang
21a719c4ca Merge "The initial implementation of the edit monitor" into main am: 8478830c57 am: 46d0d8ca11
Original change: https://android-review.googlesource.com/c/platform/build/+/3266757

Change-Id: I034705d582ca5951a520978105262c5b0b5b7534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-23 22:40:09 +00:00
Marybeth Fair
1127718899 Merge "Revert "Add fingerprint to packages.map."" into main 2024-09-23 22:17:36 +00:00
Zhuoyao Zhang
4d48559e2d Ensure a single running instance of edit monitor
This cl ensures at most 1 instance of edit monitor running from the
same binary by killing any existing instance before starting.

Specifically, When an edit monitor process starts, it will write a pidfile containing its pid and if such pidfile already exists (which means there's another instance there), it will read the pid contained in that pidfile and kill the corresponding process first.

Test: atst daemon_manager_test
bug: 365617369
Change-Id: I76954344df649aa79a6ef07ce55a62985decdb53
2024-09-23 22:04:44 +00:00
Zhuoyao Zhang
8478830c57 Merge "The initial implementation of the edit monitor" into main 2024-09-23 21:56:58 +00:00
Wei Li
0c6bc1ad45 Extract class MetadataDb to a separate python library so it can be used in notice files generation.
Bug: 330949782
Test: m sbom, no diffs in generated SBOM before/after the change
Test: build/soong/tests/sbom_test.sh
Test: CIs
Change-Id: I3cf944f744a1a5d359fd925621d1597b9681da9b
2024-09-23 21:25:12 +00:00
Marybeth Fair
a80e298d34 Revert "Add fingerprint to packages.map."
This reverts commit 769d8eed37.

Reason for revert: Caused crashed in places where old version files were present.

Change-Id: I7d529773226cd834979400aa018c47bbf6891b72
2024-09-23 19:37:21 +00:00
Wenshan Fu
d55bb477b7 Merge "Add a hostside Java lib to read proto paths" into main am: 1f56027906 am: 738ab744fe
Original change: https://android-review.googlesource.com/c/platform/build/+/3271535

Change-Id: I9d781ab6f80f46e15c2d23581e267e8b2d22a0ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 23:26:30 +00:00
Wenshan Fu
1f56027906 Merge "Add a hostside Java lib to read proto paths" into main 2024-09-20 22:44:12 +00:00
Dennis Shen
1bb460b089 Merge "aconfig: update cpp codegen" into main am: 41cb1204d5 am: 57b758db32
Original change: https://android-review.googlesource.com/c/platform/build/+/3273637

Change-Id: Iaa32eb02942fb5f05465ccd893bc850905728567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 21:44:35 +00:00
Wenshan Fu
2924961d8a Add a hostside Java lib to read proto paths
Bug: 365157972
Test: m aconfig_host_device_paths_java
Change-Id: I858cda31e1e20b7df95bd0e6883694f0dd1cdef0
2024-09-21 05:06:51 +08:00
Dennis Shen
41cb1204d5 Merge "aconfig: update cpp codegen" into main 2024-09-20 20:40:50 +00:00
Wei Li
7b1440b53a Merge "Revert "Revert "Add command line tool that generates NOTICE.xml...."" into main am: ec85ca3e8a am: 12d93c5553
Original change: https://android-review.googlesource.com/c/platform/build/+/3273293

Change-Id: Ic81f445d3209898dbed09ffc53842c0ba7990cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 18:30:35 +00:00
Wei Li
ec85ca3e8a Merge "Revert "Revert "Add command line tool that generates NOTICE.xml...."" into main 2024-09-20 18:03:06 +00:00
Dennis Shen
46986a4f02 aconfig: update cpp codegen
Use access system call to check existence of a file to reduce the cost.

Change-Id: Id64b419db81b2f8ac923b49f7293ee8a54aa78ca
2024-09-20 14:06:47 +00:00
Jeongik Cha
dc85c5c831 Merge "Update OWNERS for allowlist" into main am: 8ee4271956 am: 39d07fc3a7
Original change: https://android-review.googlesource.com/c/platform/build/+/3273920

Change-Id: Iebacbd163958ce81c3bc41f6141697f0c99aeb18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 00:05:35 +00:00
Zhuoyao Zhang
5335955317 The initial implementation of the edit monitor
Creates a class that will manager and monitor the actual edit watchdog
that run as a subprocess. As a first step, the class supports:
1) A start method that creates a pidfile and starts a subprocess with given target/args.
2) A stop method that terminates the created subprocess and removes the pidfile.

Detailed design in go/android-local-edit-monitor.

Test: atest daemon_manager_test
bug: 365617369
Change-Id: Ic6d7be67d284ade8033416235b9b0fb1e90e1b1a
2024-09-19 23:44:24 +00:00
Jeongik Cha
8ee4271956 Merge "Update OWNERS for allowlist" into main 2024-09-19 23:28:15 +00:00
Marybeth Fair
3884d56713 Merge "Add fingerprint to packages.map." into main am: df1a87770a am: 954288c041
Original change: https://android-review.googlesource.com/c/platform/build/+/3256996

Change-Id: I2fd1cc325bcf72279c963f3f7ba5c8ccd5bac4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 19:27:58 +00:00
Marybeth Fair
df1a87770a Merge "Add fingerprint to packages.map." into main 2024-09-19 19:18:28 +00:00
Priyanka Advani (xWF)
159dd4c276 Merge "Revert "Add command line tool that generates NOTICE.xml.gz for p..."" into main am: 75501177a5 am: f13f451e8b
Original change: https://android-review.googlesource.com/c/platform/build/+/3272667

Change-Id: I922961cd61934fefb09d8e4dd3a9de2e703961ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 18:02:33 +00:00
Wei Li
486c627e72 Revert "Revert "Add command line tool that generates NOTICE.xml...."
Revert submission 3272666-revert-3273112-soong-notice-xml-XKFAUDLTXP

Reason for revert: reland it

Reverted changes: /q/submissionid:3272666-revert-3273112-soong-notice-xml-XKFAUDLTXP

Change-Id: Ica8daafbc5f1bc0bc473c939c595666403349739
2024-09-19 17:55:12 +00:00
Priyanka Advani (xWF)
75501177a5 Merge "Revert "Add command line tool that generates NOTICE.xml.gz for p..."" into main 2024-09-19 17:53:20 +00:00
Treehugger Robot
0ccd5b29ba Merge "aconfig: cpp test-mode lib" into main am: 8e571eea6d am: a3c3cdce43
Original change: https://android-review.googlesource.com/c/platform/build/+/3272287

Change-Id: Ifc1596a84c3b7320b656ab3e2f63b96906891626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 17:49:09 +00:00
Wei Li
71f114e347 Merge "Add command line tool that generates NOTICE.xml.gz for partitions." into main am: 9c3097d5fb am: 8c0d7cd133
Original change: https://android-review.googlesource.com/c/platform/build/+/3271576

Change-Id: I92d7fd14171ceedf62ddb111ea9bf277f9406243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 17:48:09 +00:00
Priyanka Advani (xWF)
2f37c1980c Revert "Add command line tool that generates NOTICE.xml.gz for p..."
Revert submission 3273112-soong-notice-xml

Reason for revert: Droidmonitor created revert due to b/368348129.

Reverted changes: /q/submissionid:3273112-soong-notice-xml

Change-Id: I55e1e93aa6d4b311c6ee461d4216a104909af842
2024-09-19 17:43:39 +00:00
Treehugger Robot
8e571eea6d Merge "aconfig: cpp test-mode lib" into main 2024-09-19 17:42:29 +00:00
Wei Li
9c3097d5fb Merge "Add command line tool that generates NOTICE.xml.gz for partitions." into main 2024-09-19 17:37:06 +00:00
Treehugger Robot
a1ecbc8f2f Merge "Add etc/bpf/uprobestats/ProcessManagement.o in allowlist" into main am: 8a1e78aa9c am: 54f7f3cce5
Original change: https://android-review.googlesource.com/c/platform/build/+/3273919

Change-Id: I2b8399527de71fcad50e55f02cb8cb821cd5af8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 17:17:31 +00:00
Treehugger Robot
8a1e78aa9c Merge "Add etc/bpf/uprobestats/ProcessManagement.o in allowlist" into main 2024-09-19 17:04:32 +00:00
Jeongik Cha
ac740c3ef9 Update OWNERS for allowlist
Bug: n/a
Test: n/a
Change-Id: I7a186fbc89d5edf75efc76791e554c67bc02ef75
2024-09-20 00:33:25 +09:00
Jeongik Cha
392c0c954d Add etc/bpf/uprobestats/ProcessManagement.o in allowlist
to unblock build failure

Bug: 351698657
Bug: 368185982
Test: build
Change-Id: I1017091dd26cd74b471d1d71c3f3b6ad80a0c50a
2024-09-20 00:29:03 +09:00
Marybeth Fair
769d8eed37 Add fingerprint to packages.map.
No guards to this change because we will guard actually writing the
fingerprint, and right now new storage is not in trunkfood yet. This
change modifies the package map file structure. Note that if the new
storage was in trunkfood, this could (theoretically) cause issues if
there were cross-container READ_WRITE flags (not permitted per
documentation) and if the containers were built at separate aconfig
versions (ie before and after this change). Adding the fingerprint will
help prevent such issues in the future. Incremented the storage version
number as I've changed the format.

Again, fingerprint is not actually written in this CL, it always has a
value of 0.

Updated the test files as well to have the new version and the
fingerprint. Since this changed the package node size, some of the
information in the buckets there (offset) has changed as well.

Also added a test util for flags from another package to test future
changes.

Bug: 316357686
Test: atest aconfig.test
Change-Id: I09e10808492f241fe78028d2757f7d63328623c3
2024-09-19 10:17:23 -04:00
William Escande
01d6bb3aae aconfig: cpp test-mode lib
Incompatible interface between test-mode and normal mode.

Bluetooth is linking the normal flag for the code that is shipped, and
it is linking the test-mode library for unit testing.
While trying to move some test to use the test-mode, we noticed some
failure as the flag returned were not the one expected.

It appear the code and the test are built against 2 different library,
but linked against one.
The provide interface only contains getter in normal mode, and it is
alternating between getter/setter in test-mode.
By moving the setter in test-mode toward the end of the interface, we
are not modifying the assumed order for the code built against the
normal mode.

This CL is a short term fix, to make the test goes green and prevent
immediat failure. An refactor of the cpp generated code should be done
to avoid using 2 different version of the same symbol in 2 different
libs.

Bug: 311772251
Test: atest aconfig.test
Change-Id: I97f6523452c451d005d2e92bfa1ef861611ab840
2024-09-18 18:01:20 -07:00
Wei Li
e4c1ec9466 Add command line tool that generates NOTICE.xml.gz for partitions.
The tool currently generates a XML file with the root element only and its content will be filled in in following CLs.

Also disable the generation of NOTICE.xml.gz in make when USE_SOONG_DEFINED_SYSTEM_IMAGE is true, so the Soong module could be used without conflict.

Bug: 330949782
Bug: 338342381
Test: lunch aosp_cf_x86_64_phone-trunk_staging-eng && m, and check that system/etc/NOTICE.xml.gz have all the XML elements.
Test: lunch aosp_cf_x86_64_phone_soong_system-trunk_staging-eng && m, and check that system/etc/NOTICE.xml.gz has root element only.
Change-Id: I82e90bd9aa3dabc605acfe8da697ab1f7e7ecf9b
2024-09-18 20:48:34 +00:00
Dennis Shen
a66e86a0b0 Merge "aconfig: update cpp_codegen to just read from new storage" into main am: 5b6b40e037 am: 390991bd61
Original change: https://android-review.googlesource.com/c/platform/build/+/3266995

Change-Id: Ie99ad0d876a2fe823952ab7df17a2c1f8292ec40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 02:35:16 +00:00
Dennis Shen
5b6b40e037 Merge "aconfig: update cpp_codegen to just read from new storage" into main 2024-09-18 01:53:30 +00:00
Zhuoyao Zhang
e27d217ae3 Merge "Bootstrap the edit monitor project" into main am: cd1908f552 am: 01b092672d
Original change: https://android-review.googlesource.com/c/platform/build/+/3261331

Change-Id: I51f32dcf34cc2c1f53bedaa035a86a64c5b5acaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 21:17:36 +00:00
Dennis Shen
ee4e44ade7 aconfig: update cpp_codegen to just read from new storage
Change-Id: Ifc5886e587a64da0d940df903f972593c5e9c9d8
2024-09-17 21:11:22 +00:00
Zhuoyao Zhang
cd1908f552 Merge "Bootstrap the edit monitor project" into main 2024-09-17 20:14:39 +00:00
Dennis Shen
b015439ee6 Merge "aconfig: update rust_codegen to just read from new storage when flag is true" into main am: 869fdd13e8 am: 17b96f3ebc
Original change: https://android-review.googlesource.com/c/platform/build/+/3267213

Change-Id: If075964fad86e2a50e10b694305c0779c7cd5cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 19:58:33 +00:00
Zhuoyao Zhang
9e103e98e0 Bootstrap the edit monitor project
Add basic files required for the edit monitor project.

The project aims to monitor file changes on Android source trees that are checked out to local disk and upload the edit event logs for post analysis. More details and design doc can be found in the bug.

Bug: b/365617369
Test: None
Change-Id: Ie5e2bdb0747823f200c87ebe071f5f9a2e567b46
2024-09-17 19:16:55 +00:00
Dennis Shen
869fdd13e8 Merge "aconfig: update rust_codegen to just read from new storage when flag is true" into main 2024-09-17 19:14:14 +00:00
Dennis Shen
1b0a6667b1 aconfig: update rust_codegen to just read from new storage when flag is true
This is the last launch of new storage. Use the flag enable_only_new_storage to control if the rust codegen should read from new storage or old storage.

Change-Id: Id2bea8df191a939acb5e07b6a9ac8dc1ddd0f7fb
2024-09-17 15:03:59 +00:00
Kelvin Zhang
c07a0d1c44 Merge "Fix missing signer arg error after re-generate OTA" into main am: 0b181c9098 am: a877e85601
Original change: https://android-review.googlesource.com/c/platform/build/+/3269802

Change-Id: Ia35da1cab0cdbcd21c9e2a9318c0c1be2281b6ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 21:46:36 +00:00
Kelvin Zhang
c0ae029e87 Fix missing signer arg error after re-generate OTA
sign_target_files_apks invokes ota_from_raw_img's main function directly(without creating a new process). As a result, flag overrides in  ota_from_raw_img impacts further signing. To fix, remove unnecessary flag overrides.

Test: th
Bug: 365697483
Change-Id: Iaf6ad4132afcab4912bd4b9ea002bfa3d9a1462a
2024-09-16 21:01:45 +00:00