Commit graph

84559 commits

Author SHA1 Message Date
Treehugger Robot
8bad8c04de Merge changes from topic "aconfig-part-3" am: d279e5d79c
Original change: https://android-review.googlesource.com/c/platform/build/+/2581670

Change-Id: I0479ee840934c8195172698248fcb06887072ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 18:42:27 +00:00
Treehugger Robot
d279e5d79c Merge changes from topic "aconfig-part-3"
* changes:
  aconfig: simplify argument parsing in main
  aconfig: improve flag value tracing
2023-05-08 18:06:52 +00:00
Mårten Kongstad
2fc13df5d7 Merge changes from topic "aconfig-part-2" am: 80bff11aef
Original change: https://android-review.googlesource.com/c/platform/build/+/2578555

Change-Id: I9f41660ea3cefad70f405b93587baa005b5b4f6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:40:43 +00:00
Mårten Kongstad
98b0eeb2fc aconfig: simplify argument parsing in main
Improve readability by extracting how multiple input files are
transformed from a clap argument to an Input.

Bug: 279485059
Test: atest aconfig.test
Change-Id: I299179d39eca80e107342f6978984da79ee81e34
2023-05-08 12:47:34 +02:00
Mårten Kongstad
76adff2af0 aconfig: improve flag value tracing
Improve how the flag values (state, permission) are tracked when parsing
config and override files: migrate from a raw string to a proper struct,
as this will make it easier when aconfig will output this data in some
structured format for other tools to consume.

Also, rename Cache.debug to Cache.trace.

Bug: 279485059
Test: atest aconfig.test
Change-Id: Idad57c969515f697e9065429d8a44c38d8a512d2
2023-05-08 12:47:34 +02:00
Mårten Kongstad
80bff11aef Merge changes from topic "aconfig-part-2"
* changes:
  aconfig: change flag values to enabled/disabled enum
  aconfig: add read/write permission
  aconfig: Source: remove unnecessary #[derive(Serialize, Deserialize)]
2023-05-08 10:46:26 +00:00
Treehugger Robot
9cc5216ed0 Merge "Script fixes and improvements." am: be8badd74e
Original change: https://android-review.googlesource.com/c/platform/build/+/2581131

Change-Id: Icf9617f5f6ddf548ce5994f2c8945bcd9c06829c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-07 01:43:18 +00:00
Treehugger Robot
be8badd74e Merge "Script fixes and improvements." 2023-05-07 01:14:30 +00:00
Alex Buynytskyy
00a88ec3ec Script fixes and improvements.
Fix to mark all versions REL.

More robust patch application. Keep getting these build breakages, not sure why. Looks like git is
confusing one folder for the other?
https://android-build.googleplex.com/builds/submitted/10065142/test_suites_arm64/latest/logs/build_error.log

Bug: 275409981
Test: run locally
Change-Id: I6173b9ecae5e9ab12d9abf2eee3f2136dc353210
2023-05-06 20:55:10 +00:00
Daniel Zheng
5236cee23c Merge "Adding Build time flag to specify Cow Version" am: d00675c764
Original change: https://android-review.googlesource.com/c/platform/build/+/2576750

Change-Id: Ic963ae9dee979073592a88bcaf249409cbe36136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 22:47:32 +00:00
Daniel Zheng
d00675c764 Merge "Adding Build time flag to specify Cow Version" 2023-05-05 22:19:02 +00:00
Daniel Zheng
025099c4bc Adding Build time flag to specify Cow Version
Adding in build time flag for specifying cow version, in preparation to
add new cow version in libsnapshot

Test: m -> cat misc-info.txt
Bug: 279954153
Change-Id: I148d4e7cdd669496c91213889787172ffd83a5ab
2023-05-05 11:03:27 -07:00
Wei Li
19563ea725 Merge "Export some make variables to soong.variables." am: 19f8eb1423
Original change: https://android-review.googlesource.com/c/platform/build/+/2576745

Change-Id: I4be7d21a0ed2ea165ad0197e81eb902b33fcb7b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 17:48:32 +00:00
Wei Li
19f8eb1423 Merge "Export some make variables to soong.variables." 2023-05-05 17:32:20 +00:00
Mårten Kongstad
c68c4eabea aconfig: change flag values to enabled/disabled enum
Change the underlying type of a flag's value from bool to an explicit
enum (Disabled, Enabled): this will hopefully reduce future confusion on
how flags are intended to be used.

Bug: 279485059
Test: atest aconfig.test
Change-Id: I9535f9b23baf93ad5916ca06fb7d21277b4573eb
2023-05-05 16:20:09 +02:00
Mårten Kongstad
416330b060 aconfig: add read/write permission
Introduce the concept of flag read/write permissions: a read-only flag
can only have its value set during the build; a writable flag can by
updated in runtime.

Bug: 279485059
Test: atest aconfig.test
Change-Id: I3ec5c9571faa54de5666120ccd60090d3db9e331
2023-05-05 13:45:28 +02:00
Mårten Kongstad
2937566c55 aconfig: Source: remove unnecessary #[derive(Serialize, Deserialize)]
The Source struct is no longer serialized/deserialized. Remove the
unused derives.

Bug: 279485059
Test: atest aconfig.test
Change-Id: Ifd78988ed8134ab43013314b4437e428a8927981
2023-05-05 10:57:19 +02:00
Treehugger Robot
47b0388e1a Merge "Inline rbc-run script" am: 6b78461d48
Original change: https://android-review.googlesource.com/c/platform/build/+/2578551

Change-Id: Iac137a0ff27acddd25a6b4f4862bd02452cb5ec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 06:29:02 +00:00
Wei Li
996830047f Export some make variables to soong.variables.
Bug: 275472038
Test: CIs
Change-Id: I2e7a07007224364418659453d979e2bee58fe5f9
2023-05-04 22:57:54 -07:00
Treehugger Robot
6b78461d48 Merge "Inline rbc-run script" 2023-05-05 05:46:08 +00:00
Treehugger Robot
c5c90c1183 Merge "(reland) Remove emulator dependencies on non emulator targets (2)" am: 52587e3a87
Original change: https://android-review.googlesource.com/c/platform/build/+/2576824

Change-Id: If041a531b5e4155a7f5fcbc924fd3a705be655aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 02:11:07 +00:00
Treehugger Robot
52587e3a87 Merge "(reland) Remove emulator dependencies on non emulator targets (2)" 2023-05-05 01:26:13 +00:00
Cole Faust
78d0254e9e Inline rbc-run script
The board configuration already had this inlined, and the addition
of a separate script makes it harder to follow what's happening.

Bug: 280685526
Test: ./build/bazel/ci/rbc_dashboard.py --quick aosp_arm64-userdebug
Change-Id: Ib76c4a46932ae81d84f854fbee5b0453266d6497
2023-05-04 18:00:11 -07:00
Treehugger Robot
4208535571 Merge "New targets for building files needed by adb sync" am: 51e1e93a98
Original change: https://android-review.googlesource.com/c/platform/build/+/2572610

Change-Id: I956acced1438a576ac615018a0c05a2fc2b43638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:22:41 +00:00
Bill Yi
9980a03d53 [automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: d98d14dc6b -s ours
am skip reason: Merged-In Iec0d67abed7e0d53976e663ca8f4d497a33199e8 with SHA-1 e870db0c38 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2579071

Change-Id: Iab63646a364e79095d6608e4bd65377cce0508bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:21:20 +00:00
Bill Yi
b102b998e5 [automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 2aa8d8eadf -s ours
am skip reason: Merged-In Iec0d67abed7e0d53976e663ca8f4d497a33199e8 with SHA-1 e870db0c38 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2579071

Change-Id: I2164b7695587fad7c99aa0e06dbb16918b9da634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:21:03 +00:00
Treehugger Robot
51e1e93a98 Merge "New targets for building files needed by adb sync" 2023-05-04 22:44:32 +00:00
Bill Yi
d98d14dc6b Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" 2023-05-04 22:39:57 +00:00
Mårten Kongstad
787a0d1ffd Merge changes from topic "aconfig-part-1" am: 0b6b92e5a5
Original change: https://android-review.googlesource.com/c/platform/build/+/2578416

Change-Id: Icdeb54a877d6e0e7df55321e4ed61d04a9011e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:27:00 +00:00
Mårten Kongstad
0b6b92e5a5 Merge changes from topic "aconfig-part-1"
* changes:
  aconfig: add support for changing flag value based on build
  aconfig: introduce cache
  aconfig: define Aconfig proto
  aconfig: add support for cargo
2023-05-04 20:36:22 +00:00
Daniel Zheng
94c8c04669 Merge "Updating fastboot-info version" am: 047ed4abf9
Original change: https://android-review.googlesource.com/c/platform/build/+/2574772

Change-Id: Ib6305c3671ab4c02ad2120ad102386c7c9bab528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:35:16 +00:00
Peter Kalauskas
df6fdeef04 New targets for building files needed by adb sync
Create new phony build targets for sync_system, sync_vendor,
sync_product, sync_system_ext, sync_odm, sync_vendor_dlkm,
sync_odm_dlkm, and sync_system_dlkm.

These build just the files on the associated partion, (e.g.
/system_ext), but not the image file (e.g. system_ext.img). Like sync,
but just for a single partition.

Test: modify System UI, m sync_system_ext && adb sync && am restart
Change-Id: I5aa40d7018e029a57114681dd16db3f1e5651a63
2023-05-04 11:02:17 -07:00
Daniel Zheng
047ed4abf9 Merge "Updating fastboot-info version" 2023-05-04 17:49:07 +00:00
Mårten Kongstad
09c28d1689 aconfig: add support for changing flag value based on build
Teach aconfig about build IDs (continuously increasing integers). Extend
the aconfig file format to allow flags to say "by default, my value is
X, but starting from build ID A, it's Y, and from build ID B, it's Z".

Bug: 279485059
Test: atest aconfig.test
Change-Id: Idde03dee06f6cb9041c0dd4ca917c8b2f2faafdd
2023-05-04 14:34:55 +02:00
Mårten Kongstad
4d2b4b047b aconfig: introduce cache
Introduce the Cache struct to represent parsed and verified aconfig and
override content. Most commands in aconfig will work of an existing
cache file, eliminating the need to re-read the input every time.

Restructure main.rs to use clap to create a proper command line
interface with support for sub-commands. main.rs is responsible for
parsing the command line, performing disk I/O and calling the correct
subcommand implementation (in commands.rs).

To simplify unit tests, subcommands never perform explicit I/O; instead
they only work with Read and Write traits.

Also add dependencies on clap, serde and serde_json.

Bug: 279485059
Test: atest aconfig.test
Change-Id: Ib6abf2eabd264009804f253874b6fba924fc391b
2023-05-04 10:40:26 +02:00
Mårten Kongstad
bb520729e8 aconfig: define Aconfig proto
Fill in aconfig.proto. Define Aconfig definitions (for introducing flags
and setting their values) and Overrides (for overriding flags regardless
of what their definitions say). More changes to the proto schema are
expected when more of the aconfig project is outlined.

Use proto2 instead of proto3: this will cause the protobuf text parser
to error on missing fields instead of returning a default value which is
ambiguous, especially for booleans. (Also, the text protobuf parser
doesn't provide good error messages: if the input is missing a field,
the error is always "1:1: Message not initialized").

Unfortunately the generated Rust wrappers around the proto structs land
in an external crate, which prevents aconfig from adding new impl
blocks. Circumvent this by converting the data read from proto into
structs defined in the aconfig crate.

Change main.rs to parse (static) text proto.

Also add dependency on anyhow.

Bug: 279485059
Test: atest aconfig.test
Change-Id: I512e3b61ef20e2f55b7699a178d466d2a9a89eac
2023-05-04 10:35:25 +02:00
Automerger Merge Worker
1001d9e2c9 Merge "Merge "Split ANGLE supported and enabled into different Makefiles." am: d2704dc746" into stage-aosp-master 2023-05-04 00:57:53 +00:00
Peiyong Lin
7ab2f27228 Merge "Split ANGLE supported and enabled into different Makefiles." am: d2704dc746
Original change: https://android-review.googlesource.com/c/platform/build/+/2571352

Change-Id: Ic102b32b2ff7e122e1be74c619cd537c96dc07ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 00:56:12 +00:00
Automerger Merge Worker
abb6ca7ab3 Merge "Merge "Support generating partial OTAs from extracted target_files" am: c3216a321b" into stage-aosp-master 2023-05-04 00:56:02 +00:00
Treehugger Robot
5e4f59f9ca Merge "Support generating partial OTAs from extracted target_files" am: c3216a321b
Original change: https://android-review.googlesource.com/c/platform/build/+/2577071

Change-Id: I79fa834772dc12fe26678238bcf80ecffd2a34ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 00:54:58 +00:00
Peiyong Lin
d2704dc746 Merge "Split ANGLE supported and enabled into different Makefiles." 2023-05-04 00:39:57 +00:00
Treehugger Robot
c3216a321b Merge "Support generating partial OTAs from extracted target_files" 2023-05-04 00:05:29 +00:00
Bill Yi
2aa8d8eadf Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE
Merged-In: Iec0d67abed7e0d53976e663ca8f4d497a33199e8
Merged-In: Ie6c40c596af6da2c2af8368c5efa5bf907c5479a
Merged-In: I264df2b5a111cf9ce4fe8d5f9f36d2fa39de5d6f
Change-Id: Ib7a4ac5e08f6ce1683c674219996bfc65dda6fce
2023-05-03 22:34:46 +00:00
Richard Xie
936f85905a Merge "Revert "Remove emulator dependencies on non emulator targets (2)"" am: 47bddbced9
Original change: https://android-review.googlesource.com/c/platform/build/+/2578933

Change-Id: Ied77636bec2d058e26c7ebd6e31754de39ac52f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 21:48:51 +00:00
Roman Kiryanov
f47363caf5 (reland) Remove emulator dependencies on non emulator targets (2)
Bug: 111538404
Test: presubmit
Change-Id: I62531f60db9bd81ea12c898913b3bbd73c873b6f
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-05-03 14:27:48 -07:00
Richard Xie
47bddbced9 Merge "Revert "Remove emulator dependencies on non emulator targets (2)"" 2023-05-03 21:09:56 +00:00
Richard Xie
02b9b9e194 Revert "Remove emulator dependencies on non emulator targets (2)"
Revert submission 2529481-aosp-no-emulator

Reason for revert: DroidMonitor: Potential culprit for Bug 280642806 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2529481-aosp-no-emulator

Change-Id: I732e1b1a1f001fe016a4e20c1a95516995522501
2023-05-03 20:56:54 +00:00
Roman Kiryanov
25a8079ca2 Merge "Remove emulator dependencies on non emulator targets (2)" am: f50711adc4
Original change: https://android-review.googlesource.com/c/platform/build/+/2529481

Change-Id: I751e69130a3ab96210cba37e51959edd6e0c44cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 18:02:38 +00:00
Treehugger Robot
acbf5e5c45 Merge "Update sdk finalizer for change to api_levels_released_versions" am: 626b012556
Original change: https://android-review.googlesource.com/c/platform/build/+/2573034

Change-Id: Id8fb00b47f16bcd17f0503e5f4fb733d3c5fc03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 18:01:54 +00:00
Roman Kiryanov
f50711adc4 Merge "Remove emulator dependencies on non emulator targets (2)" 2023-05-03 17:28:12 +00:00