Commit Graph

84112 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
f50711adc4 Merge "Remove emulator dependencies on non emulator targets (2)" 2023-05-03 17:28:12 +00:00
Treehugger Robot
626b012556 Merge "Update sdk finalizer for change to api_levels_released_versions" 2023-05-03 17:24:31 +00:00
Peiyong Lin
20d1b668db Split ANGLE supported and enabled into different Makefiles.
ANGLE binaries should be added to the PRODUCT_PACKAGES instead. This
patch also splits the angle.mk to angle_supported.mk and
angle_default.mk so that when a device just wants to ship ANGLE binaries
to coexist with native GLES drivers, it only needs to inherit the
angle_supported.mk and when a device wants to ship ANGLE as the default
system GLES drivers, it only needs to inherit the angle_default.mk. When
ANGLE is the default system GLES driver, make sure persist.graphics.egl
is defined so that ANGLE is loaded properly.

Bug: 270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I3de4a40b62b39c91c8f6df56d68755830b303f10
2023-05-03 16:44:26 +00:00
Mårten Kongstad
fe753f5365 aconfig: add support for cargo
Officially, aconfig is build using the Android tool-chain. However, to
speed up the local development cycle, add support for building with
cargo.

While it is possible to tell cargo to place the build artifacts outside
the source tree, there is no way to tell it to not generate the cargo
lock file in the same directory as Cargo.toml. Add a .gitignore to
ignore Cargo.lock and the target directory.

The way the Android build system and cargo generates code from the
protobuf files is slightly different. Tell cargo to enable the "cargo"
feature and introduce src/protos.rs to hide this difference from the
rest of the aconfig source.

Bug: 279485059
Test: m aconfig && aconfig
Test: atest aconfig.test
Test: cargo build
Test: cargo test
Change-Id: I85741f58cadae353ed95c124f566e4f4a7484186
2023-05-03 09:41:11 +02:00
Mårten Kongstad
e7a850e942 Merge "aconfig: add project scaffolding" 2023-05-03 06:18:02 +00:00
Kelvin Zhang
e30acf1b3f Parallelize generation of OTA package and target_file packing
ota_from_target_files no longer requires a zipped target file, so switch
dependency to the target_files dir. This allows build system to
parallize generation of OTA package and target file packing

Test: th
Bug: 227848550
Bug: 277028723
Change-Id: I03fb9191de3b3316ed288eaac8ae84370c2fb598
2023-05-02 20:48:14 -07:00
Kelvin Zhang
6b10e15acc Support generating partial OTAs from extracted target_files
This allows the build system to potentially paralleize generation of OTA
package and zipping of target files

Bug: 262185376
Bug: 227848550
Change-Id: I90b6c25761683ebe3803b22fc8e23540a5282c66
2023-05-02 20:48:14 -07:00
Treehugger Robot
f9f3c569d0 Merge "Generate enforce_uses_libraries.status to out/target/product" 2023-05-03 00:09:09 +00:00
Treehugger Robot
a43178f9f0 Merge "Fix whitespace in soong_config_set calls" 2023-05-02 22:26:06 +00:00
Cole Faust
3736374dfe Fix whitespace in soong_config_set calls
In make, soong_config_set uses an $(eval) to set it's value, expanding
the value of the soong config variable _before_ evaluating the value.
Because of this, make will strip trailing whitespace like it does on
regular assignments.

Make rbcrun match this behavior.

Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I907e85cdf50f6fac54331c0d1044f0d53bec22ed
2023-05-02 10:11:02 -07:00
Mårten Kongstad
867a349ed9 aconfig: add project scaffolding
Introduce a new tool, aconfig, to manage build time configurations, such
as feature flags.

This CL adds a project skeleton. Later CLs will add the actual
implementation.

Note: there is no need for an explicit TEST_MAPPING file;
rust_test_host are automatically included in host-unit-tests and
explicitly adding these tests via TEST_MAPPING will cause an error.

Bug: 279485059
Test: m aconfig && aconfig
Test: atest aconfig.test
Change-Id: I94047a19a55ae4d45b4fd7a0c8105a91ddcdfd79
2023-05-02 17:36:30 +02:00
Treehugger Robot
ed1ab26f5d Merge "Use misc_info.txt to check for VABC" 2023-05-01 22:30:19 +00:00
Treehugger Robot
8844e4f145 Merge "Remove config for 64-bit binder ABI" 2023-05-01 21:32:30 +00:00
Alex Buynytskyy
f12a969445 Merge "Set next sdk_int to previous sdk_int + 1." 2023-05-01 19:05:17 +00:00
Alex Buynytskyy
d03be09214 Set next sdk_int to previous sdk_int + 1.
OS and the finalization scripts use sdk_int - 1 in way too many places.

Bug: 275409981
Test: run locally
Change-Id: If4896a3eb0a6afadac5dbfd6ad455427d1c23d41
2023-05-01 18:56:26 +00:00
Kalesh Singh
a5530711fb Merge "16k: Add ro.product.cpu.pagesize.max property" 2023-05-01 18:08:11 +00:00
Daniel Zheng
e05a15bfed Updating fastboot-info version
Updating version to single number

Test: m fastboot_info
Change-Id: If4754f1cedd9cc1f57ffdfbb73e7e4cc7ced4799
2023-05-01 11:07:33 -07:00
Kelvin Zhang
e634bde6bd Use misc_info.txt to check for VABC
Change-Id: I77f23a51ddb027254ccda8d7ab17e64205522300
2023-04-28 23:59:43 -07:00
Treehugger Robot
6d406f854e Merge "Enable HWASan for multiple modules in one place(Make)" 2023-04-29 00:10:16 +00:00
Alex Buynytskyy
56f81f3d64 Merge "Correct if statement." 2023-04-29 00:10:15 +00:00
Alex Buynytskyy
01db2a97da Correct if statement.
Bug: 275409981
Test: run locally
Change-Id: If6b8052748f816713cd16328ad1525dcd90ded69
2023-04-29 00:06:39 +00:00
Cole Faust
cdb1a45ac2 Update sdk finalizer for change to api_levels_released_versions
Change the starlark file, not the soong one.

Bug: 279095899
Test: manually ran this snippet
Change-Id: If7b93096743f79a5303db4330fc03cbc8fb5bae3
2023-04-28 14:23:46 -07:00
Daniel Zheng
cda8aac196 Merge "Added build target for fastboot-info.txt" 2023-04-28 19:05:29 +00:00
Kalesh Singh
48033761bf Merge "16k: Define PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag" 2023-04-28 18:19:13 +00:00
Treehugger Robot
cf97263876 Merge "Enforce product interface by default" 2023-04-28 05:56:40 +00:00
Juan Yescas
e5c0c174d5 16k: Define PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag
The PRODUCT_MAX_PAGE_SIZE_SUPPORTED will be used to define the
ELF segment alignment of the binaries (executables and shared
libraries). The alignment is set based on these conditions:

- If PRODUCT_MAX_PAGE_SIZE_SUPPORTED is defined, that value will be
used to align the binaries. If not defined, see condition below:
- If it is a low memory device, 4096 will be the alignment. If it is
not low memory device, see conditon below:
- If VSR vendor API level < 34, 4096 will be the alignment, otherwise
it will be 65536.

Test: Built for in Pixel 4a, 6 and verified the alignment with readelf.
Bug: 276963698
Bug: 276801883
Change-Id: I53a8902ab62e6d378aec84c28bc627f0e8a98500
2023-04-28 02:42:00 +00:00
Alex Buynytskyy
a2a2f40414 Merge "Change CI API level to keep linter happy." 2023-04-27 22:38:18 +00:00
Alex Buynytskyy
5d205dc016 Change CI API level to keep linter happy.
Bug: 275409981
Test: run locally
Change-Id: I99d2ef4974a70f435f528c7a9358990fa41c9f5e
2023-04-27 15:30:19 -07:00
Peiyong Lin
c4c3462f2b Merge "Properly define angle.mk" 2023-04-27 19:53:33 +00:00
Alex Buynytskyy
ba71daa94e Merge "Update Android Studio Version Number." 2023-04-27 18:27:10 +00:00
Alex Buynytskyy
d873b0e46b Update Android Studio Version Number.
Bug: 275409981
Test: run locally
Change-Id: I0d62ac8178f6d69f66adde8c5889ff86bcfad0ed
2023-04-27 18:18:57 +00:00
David Anderson
816da938da Added build target for fastboot-info.txt
Bug: 194686221
Test: mm fastboot_info, fastboot flashall
Change-Id: I9db35f48f795f5ff73db7c7e7d3d1264aa660e80
2023-04-27 11:04:33 -07:00