Commit Graph

98239 Commits

Author SHA1 Message Date
Treehugger Robot
8715d314e6 Merge "Support license information in SBOM writers library." into main 2024-06-18 20:41:52 +00:00
Wei Li
c6b4046787 Support license information in SBOM writers library.
Bug: 324465531
Test: CIs
Test: atest --host sbom_data_test sbom_writers_test
Test: build/soong/tests/sbom_test.sh
Change-Id: Iac2be2e65f308caabb11237e72dbdc6b047cfd55
2024-06-18 12:34:30 -07:00
Cole Faust
318fc99a13 Merge "Add PLATFORM_SEPOLICY_VERSION as a soong config variable" into main 2024-06-18 18:05:42 +00:00
Steven Moreland
ca5e5d6fd6 Merge "Consider non-shipping lunch targets to be future." into main 2024-06-18 17:40:24 +00:00
Treehugger Robot
5f3c693d6d Merge "Add trendy team for Android Media Solutions Editing" into main 2024-06-18 16:31:37 +00:00
Treehugger Robot
bb4e87008f Merge "aflags: Ensure <partition>/aconfig_flags.pb exists before reading" into main 2024-06-18 15:27:36 +00:00
Ted Bauer
ad85a2a15c Merge "Add defaults target for shared linking" into main 2024-06-18 15:01:39 +00:00
Luca Stefani
bc962db1ea aflags: Ensure <partition>/aconfig_flags.pb exists before reading
In some build targets/combinations aconfig_flags.pb
may not be generated.

For example in GSI only system/aconfig_flags.pb exists
and system-only updates won't have vendor/aconfig_flags.pb.

Test: m, aflags
Change-Id: I136345a8748bc6d80bd98e673f90e0a2ab380ab1
2024-06-18 06:59:52 +00:00
Inseob Kim
b9df6c75da Merge "Add soong extra config file" into main 2024-06-18 03:57:41 +00:00
Yihan Dong
2aa31e6404 Add trendy team for Android Media Solutions Editing
Test: m
Bug: 342941455
Change-Id: I18e0abfb0beaacf6d5376e10e65b19433f769299
2024-06-18 01:39:22 +00:00
Wei Li
efc2f7cd5d Merge "Add module type information to make modules." into main 2024-06-18 00:02:34 +00:00
Wei Li
79158bd6cf Merge "Record binary modules' whole static library dependencies in make." into main 2024-06-17 23:18:27 +00:00
Wei Li
a73c8bc224 Record binary modules' whole static library dependencies in make.
Bug: 324465531
Test: CIs
Change-Id: Icf2a664b11d29be18bbf3ab16286b7fc746b9ba6
2024-06-17 15:06:20 -07:00
Wei Li
0762f5f02a Add module type information to make modules.
To be paired with $(call record-module-type)

Bug: 324465531
Test: CIs
Change-Id: Ie1649093e299c43a2642fb9d27a0a56b1c8e40c1
2024-06-17 21:53:27 +00:00
Ted Bauer
6e11172c6b Add defaults target for shared linking
Add a defaults target that all targets linking to aconfig codegen with
the new storage API dependencies will need. The target takes the new
storage APIs conditionally behind a flag, so we can disable it easily.

In this topic, we add it to a single target to see that it builds and
adds the dependency. In follow-on CLs we can add it to the rest of the
targets.

Test: m audiopolicy_tests
Bug: 347701310
Change-Id: I67643205b283301f72c5466401060212b637388f
Merged-In: I67643205b283301f72c5466401060212b637388f
2024-06-17 21:16:51 +00:00
Cole Faust
f4ad02f818 Add PLATFORM_SEPOLICY_VERSION as a soong config variable
So that it can be used in android.bp files. This is to replace the
existing usages of PLATFORM_SEPOLICY_COMPAT_VERSIONS.

Bug: 347605145
Bug: 342006386
Test: m nothing --no-skip-soong-tests
Change-Id: Ia2831fa2c77b2f55d4e39e48b71acf13c605bf1e
2024-06-17 12:38:41 -07:00
Xin Li
3ab9f3fdb9 Merge "Merge Android 14 QPR3 to AOSP main" into main 2024-06-17 18:51:26 +00:00
Treehugger Robot
9ee0664b4e Merge "Add root check to aflags" into main 2024-06-17 16:39:40 +00:00
Ted Bauer
5223a70887 Add root check to aflags
aflags scans the apex/ dir, which requires root access to read.
Currently the command fails with "Error: Permission denied", which
doesn't tell the user how to fix the problem. This CL adds a more
descriptive error message.

Test: adb unroot && adb shell aflags list
Bug: 347692127
Change-Id: I98a7a1ba10ef52ec47035816fa66119ea84f281d
2024-06-17 15:25:02 +00:00
Inseob Kim
15961c8523 Add soong extra config file
Soong extra config file contains Makefile variables that Soong itself
doesn't need to know. It will be read by product_config module to
provide Makefile variables to build tools e.g. build.prop.

Bug: 346214955
Test: see output of product_config module
Change-Id: I045b2722ae85a10d33b9e6b832f4cc2d6789e59a
2024-06-17 10:18:14 +09:00
Treehugger Robot
e7a2e5994f Merge "zipalign: succesful -> successful" into main 2024-06-14 18:30:41 +00:00
Xin Li
1a1f7e24db Merge Android 14 QPR3 to AOSP main
Bug: 346855327
Merged-In: Ie02b703ac8821dd8a1f6a95c026219a8a2e12fe1
Change-Id: I53e7b86a23b9860ef83a5ab635bc1a0701c4f346
2024-06-14 10:45:53 -07:00
Liz Prucka
84e288f3ca Merge "Add Attack Tools team" into main am: bfe14d1975
Original change: https://android-review.googlesource.com/c/platform/build/+/3132528

Change-Id: Ie02b703ac8821dd8a1f6a95c026219a8a2e12fe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 15:36:22 +00:00
Liz Prucka
bfe14d1975 Merge "Add Attack Tools team" into main 2024-06-14 15:31:34 +00:00
Treehugger Robot
33a0dc9153 Merge "Move clean-oat-host to build/core/tasks/art.mk" into main am: 98905f38c2
Original change: https://android-review.googlesource.com/c/platform/build/+/3127593

Change-Id: I185383a0ab40c123536adc5e382954d27d2c76e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 00:50:13 +00:00
Treehugger Robot
98905f38c2 Merge "Move clean-oat-host to build/core/tasks/art.mk" into main 2024-06-14 00:46:46 +00:00
Liz Prucka
c38b8df473 Add Attack Tools team
Bug: b/347053759
Test: CIs
Change-Id: Ifee2f24ed32bcddfafd1cf55adfa479d6c5370d6
2024-06-13 22:35:25 +00:00
Treehugger Robot
3694e76222 Merge "Require protobuf for build flags" into aosp-main-future 2024-06-13 20:05:39 +00:00
Treehugger Robot
f3aab9de59 Merge "Allow experimental use of Java 21 by default in makefiles" into main am: 0aeb964be8
Original change: https://android-review.googlesource.com/c/platform/build/+/3125236

Change-Id: I3591e94a4a92ec6a3f5b822ce44de20993d1614f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 19:19:32 +00:00
Treehugger Robot
0aeb964be8 Merge "Allow experimental use of Java 21 by default in makefiles" into main 2024-06-13 19:15:50 +00:00
LaMont Jones
e3e84fc1b7 Require protobuf for build flags
This change forces build flags from .scl to .textproto format.

Bug: 328495189
Bug: 338450506
Test: manual, TH
Merged-In: Ia33aae158d62c12666d97449cea0c02b60550a21
Change-Id: Ia33aae158d62c12666d97449cea0c02b60550a21
2024-06-13 10:54:21 -07:00
Treehugger Robot
03468748d3 Merge "Shift the preprocess mk before build emulator packages" into main am: 9566130852
Original change: https://android-review.googlesource.com/c/platform/build/+/3128074

Change-Id: Ia51da8f3a3da18ce26af01d6503c2c2dc6491792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 08:36:39 +00:00
Treehugger Robot
9566130852 Merge "Shift the preprocess mk before build emulator packages" into main 2024-06-13 08:26:54 +00:00
Herbert Xue
9852b95ff3 Shift the preprocess mk before build emulator packages
Test run:
- https://android-build.corp.google.com/builds/abtd/run/L68900030004495469

Bug: 344588337
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk_g3caiman_x86_64 TARGET_RELEASE=trunk TARGET_BUILD_VARIANT=userdebug droid dist
Change-Id: I7d050428d5cc17de8078f8824991b71b7915a4a4
2024-06-13 14:36:13 +08:00
Treehugger Robot
c17b8e9aa6 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main am: f94c02c7f3
Original change: https://android-review.googlesource.com/c/platform/build/+/3127554

Change-Id: I3eb52390b1da643d2e28e373560bde96d35076e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 02:43:51 +00:00
Treehugger Robot
f94c02c7f3 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main 2024-06-13 02:34:51 +00:00
Nelson Li
4abfb5c09e Move clean-oat-host to build/core/tasks/art.mk
Since Soong genrules now run in sandboxed mode, they cannot execute
commands like `rm -rf` within `clean-oat-target` to remove physical
directories.

The only solution is to move the `clean-oat-target` commands into
`build/core/tasks`.

Bug: 345133095
Test: m clean-oat; m clean-oat-host
Change-Id: Ifce4d5dc4bdb8e3735784135cf6f2ff143e90fe9
2024-06-13 02:09:35 +00:00
Treehugger Robot
200880c0b7 Merge "Convert appcompat.sh to a Python binary" into main am: 3dcc84df5c
Original change: https://android-review.googlesource.com/c/platform/build/+/3106579

Change-Id: I5bdfde8f27751ae817596c1a1dbcb1411c31f3c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 01:06:05 +00:00
Treehugger Robot
3dcc84df5c Merge "Convert appcompat.sh to a Python binary" into main 2024-06-13 00:51:27 +00:00
Herbert Xue
5c71b1af0e Move license metadata declaration of bramble/Android.mk into meta-lic.mk
Bug: 346457924
Test: NA
Change-Id: Ie0fcb71bd3a10d54700256f3e19296a6aaac1298
2024-06-12 14:34:31 +08:00
Yihan Dong
bfcfb660e5 Merge "Add Android Media Better Together team" into main am: de53f614f4
Original change: https://android-review.googlesource.com/c/platform/build/+/3124555

Change-Id: Ie9e7a1b9ceddd608495f2317a728d9742afbebe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 06:04:30 +00:00
Yihan Dong
de53f614f4 Merge "Add Android Media Better Together team" into main 2024-06-12 05:43:44 +00:00
Yihan Dong
2880eac1a3 Add Android Media Better Together team
Bug: 342941281
Change-Id: Ib96e26fe625511bd9e9cc3086f3ff12a234dc588
Test: m noting
2024-06-12 01:16:45 +00:00
Treehugger Robot
5a648e50c9 Merge "Set widevine apex signed with dev key" into main am: 683eb4b502
Original change: https://android-review.googlesource.com/c/platform/build/+/3101237

Change-Id: I58b8a290fcbcda4ff8e3cc478ba2e3d0328f35f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:04:03 +00:00
Treehugger Robot
683eb4b502 Merge "Set widevine apex signed with dev key" into main 2024-06-11 22:46:44 +00:00
Kyle Zhang
cc21bf8b29 Set widevine apex signed with dev key
Bug: 341134913
Change-Id: Ied39e2a1dd4b715afc2ee4d35c18b52eabfc417f
2024-06-11 21:45:34 +00:00
Zhuoyao Zhang
e67102e2e1 Merge "Support tool event logging for fastboot" into main am: 9a74753a84
Original change: https://android-review.googlesource.com/c/platform/build/+/3123151

Change-Id: Ie688a8009cfc3f733f596a8e7906133e80dc22dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 18:20:28 +00:00
Zhuoyao Zhang
9a74753a84 Merge "Support tool event logging for fastboot" into main 2024-06-11 18:08:30 +00:00
Steven Moreland
cffced3727 zipalign: succesful -> successful
Bugs: me
Change-Id: I6cc866b3d8765ed6ef553f2de80bba995bdbc095
Test: n/a
2024-06-11 17:07:44 +00:00
Sorin Basca
73ba79702e Allow experimental use of Java 21 by default in makefiles
Bug: 342332820
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_21=true m javac-check lint-check dist
Change-Id: I510746d617c49a0423f1ab0171a3474b181c3875
2024-06-11 14:30:39 +01:00