Commit Graph

34570 Commits

Author SHA1 Message Date
Treehugger Robot
c4ebac631b Merge "Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" 2023-06-26 12:04:42 +00:00
Mitch Phillips
c77b68f30d Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." am: 61ce7afb21 am: 49211348ea am: c6076a3bb6
Original change: https://android-review.googlesource.com/c/platform/build/+/2625936

Change-Id: I3ab9dd553e2d83c5cffbf0744f9c298b1ce766db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 08:08:55 +00:00
Mitch Phillips
c6076a3bb6 Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." am: 61ce7afb21 am: 49211348ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2625936

Change-Id: I205582b4e6914f5363b8ef5ef9b588e948794637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 07:18:58 +00:00
Lukacs T. Berki
3a958ff8a0 Change initialization message.
There are now two newer build systems.

Test: Presubmit.
Change-Id: I9e62e9223ddc757d71f1b404e1cc0a0634b740d4
2023-06-26 07:04:42 +00:00
Mitch Phillips
49211348ea Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." am: 61ce7afb21
Original change: https://android-review.googlesource.com/c/platform/build/+/2625936

Change-Id: I02a301fb3f60fd35bf63e3d7c7f0eb0451e5a876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 06:38:11 +00:00
Mitch Phillips
61ce7afb21 Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." 2023-06-26 05:50:11 +00:00
Gabriel Biren
26efa8c17e Merge "Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"" am: 6656e58856 am: dbe8cb7530 am: 3f30113322
Original change: https://android-review.googlesource.com/c/platform/build/+/2636149

Change-Id: I5e6067027ffa457ac1fae24b2e884854575a89bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 18:30:59 +00:00
Gabriel Biren
3f30113322 Merge "Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"" am: 6656e58856 am: dbe8cb7530
Original change: https://android-review.googlesource.com/c/platform/build/+/2636149

Change-Id: Ie28a6a9acf185c0dbe23612a66a6834364409664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 17:40:22 +00:00
Gabriel Biren
dbe8cb7530 Merge "Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"" am: 6656e58856
Original change: https://android-review.googlesource.com/c/platform/build/+/2636149

Change-Id: Ib0bd147c4123216fad664af54ceec95d05edf89d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 17:00:31 +00:00
Gabriel Biren
6656e58856 Merge "Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"" 2023-06-23 16:19:13 +00:00
Jooyung Han
0d7864a723 Merge "Do not pass TARGET_FLATTEN_APEX to soong" am: bd7ef6bc94 am: 3e75b8234f am: 44abd26c56
Original change: https://android-review.googlesource.com/c/platform/build/+/2632449

Change-Id: Ic74df87c2c3c6a636a464416f824fe74c4674477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 07:09:09 +00:00
Inseob Kim
77e317d852 Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 288517951
Test: m selinux_policy
Change-Id: I4d5b0bffbc7dd4ec3852da1674937e349e2ab322
2023-06-23 15:51:26 +09:00
Pranav Gupta
db3e60fecc DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: I1111def4e05999ecb48856855b7ee519a1ed6ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 06:00:07 +00:00
Jooyung Han
44abd26c56 Merge "Do not pass TARGET_FLATTEN_APEX to soong" am: bd7ef6bc94 am: 3e75b8234f
Original change: https://android-review.googlesource.com/c/platform/build/+/2632449

Change-Id: I0b0f5d144a83cd8f2e54e8077203278f3bddd4de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 05:36:25 +00:00
Jooyung Han
3e75b8234f Merge "Do not pass TARGET_FLATTEN_APEX to soong" am: bd7ef6bc94
Original change: https://android-review.googlesource.com/c/platform/build/+/2632449

Change-Id: I553990cf398e5ad6c13dfacca401e6132ec5db4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 04:59:55 +00:00
Pranav Gupta
20545fcf21 DO NOT MERGE: Enable mainline prebuilts for device targets
Ignore-AOSP-First: Android Mainline prebuilts are not used for AOSP targets
Bug: 286892268
Change-Id: I6f89f47a8e545e563b184cdc9395eddd49950228
Test: pre-submit
2023-06-23 04:59:26 +00:00
Jooyung Han
bd7ef6bc94 Merge "Do not pass TARGET_FLATTEN_APEX to soong" 2023-06-23 04:09:48 +00:00
Wei Li
872ac0af75 Merge "Revert "Support SBOM generation of m build unbundled APEXs."" am: d952b49430 am: 4aea05c316 am: 399ae160a5
Original change: https://android-review.googlesource.com/c/platform/build/+/2636172

Change-Id: Iab94c5080037ae44b1464e8206050ab0d0864617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 00:52:30 +00:00
Wei Li
399ae160a5 Merge "Revert "Support SBOM generation of m build unbundled APEXs."" am: d952b49430 am: 4aea05c316
Original change: https://android-review.googlesource.com/c/platform/build/+/2636172

Change-Id: Ic5d552e8cd0ca3ed674d2eb20408622e05bc26e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 00:07:37 +00:00
Wei Li
4aea05c316 Merge "Revert "Support SBOM generation of m build unbundled APEXs."" am: d952b49430
Original change: https://android-review.googlesource.com/c/platform/build/+/2636172

Change-Id: I170b70bb4c94bd7ce93d17c68f938886aa29df2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 23:25:26 +00:00
Wei Li
d952b49430 Merge "Revert "Support SBOM generation of m build unbundled APEXs."" 2023-06-22 22:35:48 +00:00
Wei Li
bab162156e Revert "Support SBOM generation of m build unbundled APEXs."
This reverts commit 7c4f064a2b.

Reason for revert: this caused some CI breakages on git_master, mainline_modules_xxxx

Change-Id: I95354db66991f6c257164d6f808b9fe4350673c1
2023-06-22 22:21:00 +00:00
Daniel Zheng
0d1b969d1f Adding recovery image
adding recovery image to fastboot-info

Test: m fastboot_info
Change-Id: I65cfb4e3953d94455638002a3ccf442c5ad87a9e
2023-06-22 14:52:59 -07:00
Gabriel Biren
720deccc0b Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"
This reverts commit fdcf16f55c.

Reason for revert: Variable belongs internally

Change-Id: I3af8968f36f68bed34f40c921608582b1798ca65
2023-06-22 17:32:03 +00:00
Mitch Phillips
8520f4b19e [MTE] [gnu make] Add memtag_globals as a sanitizer target.
GNU make bits for https://android-review.git.corp.google.com/c/platform/build/soong/+/2625692.

Bug: N/A
Test: Build {libc, libm, libc++, libm, and libnetd} in internal master
with these patches and an experimental compiler with the lld support.
Also, `SANITIZE_TARGET=memtag_globals m` here with in-tree compiler
without lld support.

Change-Id: I44c239ba907a90a355c46e12afbbbe96bb2e4426
2023-06-22 17:05:01 +00:00
Joe Onorato
4a80353011 Merge "Rename device_config --> aconfig and definitions --> declarations" am: 9ccb457588 am: 958b906ed8 am: a83f50d161
Original change: https://android-review.googlesource.com/c/platform/build/+/2633872

Change-Id: If9360ebd0acebe85f42f89a268c316d51c765708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 15:36:36 +00:00
Joe Onorato
a83f50d161 Merge "Rename device_config --> aconfig and definitions --> declarations" am: 9ccb457588 am: 958b906ed8
Original change: https://android-review.googlesource.com/c/platform/build/+/2633872

Change-Id: I6e51f481e4ea50cdcd0006dd95cfab65d52fd061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 14:49:02 +00:00
Joe Onorato
958b906ed8 Merge "Rename device_config --> aconfig and definitions --> declarations" am: 9ccb457588
Original change: https://android-review.googlesource.com/c/platform/build/+/2633872

Change-Id: I0cb0c21ac2df9a34caf4e82346007674f49c97d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 14:10:22 +00:00
Joe Onorato
9ccb457588 Merge "Rename device_config --> aconfig and definitions --> declarations" 2023-06-22 13:30:53 +00:00
Joe Onorato
6aa48f8c5f Rename device_config --> aconfig and definitions --> declarations
Bug: 285303012
Test: for x in next trunk trunk_food trunk_staging ; do lunch aosp_panther-$x-eng ; m nothing ; done
Change-Id: I174ce3e609fa9077ea6bc61679ddb83e8efe57c8
2023-06-21 15:18:15 -07:00
Xin Li
7f534ea9b9 Merge Android 13 QPR3
Bug: 275386652
Merged-In: I33c7269d88483337838d4f4291d8639623633a5a
Change-Id: I56d23100e4b1b2d0d0df57873c0db3bd24de617e
2023-06-21 15:17:49 -07:00
Wei Li
bec91f56e8 Merge "Support SBOM generation of m build unbundled APEXs." am: 8968aa544b am: d0f23a62b8 am: 572a3cca73
Original change: https://android-review.googlesource.com/c/platform/build/+/2631450

Change-Id: Ie1845a9a0fd55d531fce2994aca44cd8246034b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 20:30:18 +00:00
Wei Li
572a3cca73 Merge "Support SBOM generation of m build unbundled APEXs." am: 8968aa544b am: d0f23a62b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2631450

Change-Id: I530acfee2343cd882ec535ab10dbb9874ce2ce57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 19:22:49 +00:00
Wei Li
d0f23a62b8 Merge "Support SBOM generation of m build unbundled APEXs." am: 8968aa544b
Original change: https://android-review.googlesource.com/c/platform/build/+/2631450

Change-Id: Ib264a1079d7d6f6f1aa2f77d75d7400fbab1d66d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 18:35:59 +00:00
Wei Li
8968aa544b Merge "Support SBOM generation of m build unbundled APEXs." 2023-06-21 17:50:17 +00:00
Gabriel Biren
ef675cc35a Merge "Add rule to convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable." am: a58ce5e9d3 am: 8fee18a6f3 am: 779ea19ecd
Original change: https://android-review.googlesource.com/c/platform/build/+/2627737

Change-Id: I2a18e0ab5c2998e1d7f61f81d66c1bb01545641f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 17:29:42 +00:00
Gabriel Biren
779ea19ecd Merge "Add rule to convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable." am: a58ce5e9d3 am: 8fee18a6f3
Original change: https://android-review.googlesource.com/c/platform/build/+/2627737

Change-Id: I6a14bcd0a31804ec7f69795c49a6893118aaf807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 16:43:04 +00:00
Gabriel Biren
8fee18a6f3 Merge "Add rule to convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable." am: a58ce5e9d3
Original change: https://android-review.googlesource.com/c/platform/build/+/2627737

Change-Id: I33c7269d88483337838d4f4291d8639623633a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 16:03:17 +00:00
Gabriel Biren
a58ce5e9d3 Merge "Add rule to convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable." 2023-06-21 15:19:51 +00:00
Treehugger Robot
adb009c0f5 Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb am: 2a477ccdbb am: 1ff91ea214
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I072e9977c10ea905c82ed7fddb27431447155b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:35:55 +00:00
Treehugger Robot
1ff91ea214 Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb am: 2a477ccdbb
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: Ie855f1b5d0f4844165452135ab4fe1e75625c3ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:47:14 +00:00
Treehugger Robot
2a477ccdbb Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I26c965b0079dacc14c1b4a83ce545a919d7f33cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:08:08 +00:00
Jooyung Han
6d273b9624 Do not pass TARGET_FLATTEN_APEX to soong
Soong no longer supports "flattened" apex. This makes
TARGET_FLATTEN_APEX no-op.

Will remove TARGET_FLATTEN_APEX later.

Bug: 279835185
Test: m && launch_cvd (cuttlefish)
Change-Id: I27c6181f5107fd27552304c5dd25d2c0a21c4bec
2023-06-21 14:22:00 +09:00
Treehugger Robot
d0c29cbdeb Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" 2023-06-21 05:18:58 +00:00
Wei Li
7c4f064a2b Support SBOM generation of m build unbundled APEXs.
Bug: 266726655
Test: banchan com.android.adbd arm64 userdebug && m dist
Test: build/soong/tests/sbom_test.sh
Change-Id: I7abadbc083ef66b0e8ace28de69a1a219670ec37
2023-06-20 11:23:56 -07:00
Jiakai Zhang
2721abe7d4 Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518 am: 9778268c87 am: aaa9e6ac0a
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038

Change-Id: Ia060a7e6d0e8b3008e8345f5f6b9234661e98816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 16:03:11 +00:00
Jiakai Zhang
aaa9e6ac0a Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518 am: 9778268c87
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038

Change-Id: I42dc72722af03f968b96f680ac8670077f9e8d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 15:16:08 +00:00
Jiakai Zhang
9778268c87 Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038

Change-Id: I02e2fae8e1707fbb11b76bfad7c364527b855bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 14:38:23 +00:00
Jiakai Zhang
bedc1d3518 Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." 2023-06-20 13:52:04 +00:00
Jooyung Han
8cc42f429f Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
We will deprecate flattened apexes. In this change, GSI-specific make
variable (PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES) is removed. The
variable was used to install both image/flattened apexes in the GSI, so
that it works on ro.apex.updatable devices and not-updatable devices.

Now, GSI will have only image APEXes in it.

Bug: 278826656
Test: lunch gsi_arm64-userdebug && m # no flattened apexes
Change-Id: I4702973d4ee75aa693e4e7f4e57577b77059dc09
2023-06-20 14:27:10 +09:00