Commit graph

96949 commits

Author SHA1 Message Date
Treehugger Robot
c135861a61 Merge "Fix cogsetup.sh to work from non-root dirs" into main 2024-02-29 18:19:56 +00:00
Alyssa Ketpreechasawat
eb4f3ec4b8 Merge "Use build flag to control the apex boot jars to be excluded." into main 2024-02-29 18:17:09 +00:00
Wei Li
9f3159b407 Merge "Add meta-lic.mk for declaring license metadata of some 1P files." into main am: 7c48999446 am: c1ed63b8d0
Original change: https://android-review.googlesource.com/c/platform/build/+/2983691

Change-Id: I6f8338cfc9e6b0e465e02b06ffc6fea1d748bc51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 17:41:33 +00:00
Wei Li
c1ed63b8d0 Merge "Add meta-lic.mk for declaring license metadata of some 1P files." into main am: 7c48999446
Original change: https://android-review.googlesource.com/c/platform/build/+/2983691

Change-Id: Ib6bca4f2400a3197fe683107a2c7c3a2d1ff0b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 16:59:44 +00:00
Masha Khokhlova
0fa33f2d64 [automerger skipped] Bump SDK Extension version to 12 am: ad49b31229 -s ours
am skip reason: Merged-In I0cabba5faa4535dcdff3aa8b87aa61ac06ac9edb with SHA-1 ea0c5565db is already in history

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

Change-Id: I2ab5c8c57727d093de1b976753b78002906eda7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 16:58:53 +00:00
Wei Li
7c48999446 Merge "Add meta-lic.mk for declaring license metadata of some 1P files." into main 2024-02-29 16:23:27 +00:00
Zhi Dou
036cdbe92f aconfig: disable export mode for generated native flag libraries
Currently the default flag values are not loaded into sysprop. Since the
current requirements for export flag are for flagged api in java and the
new storage system will load default values for all, there won't be
changes to make the default value loaded into sysprop. Thus this change
disable export mode for generated native flag libraries for now. It will
be enabled once the new storage is landed.

Test: m libaconfig_test_rust_library_with_exported_mode and expect build
failure
Bug: 327392334

Change-Id: I2db814d015cdb533778822f7417d055b251ed589
2024-02-29 12:57:24 +00:00
Masha Khokhlova
ad49b31229 Bump SDK Extension version to 12
This bump includes Adservices, HealthFitness, Mediaprovider, Tethering, Extservices

Bug: b/327320298
Test: The build passes
Ignore-AOSP-first: Finalization is not performed in AOSP
Change-Id: I519a7238800aa49a595aac88f6c738c154f7a503
Merged-In: I0cabba5faa4535dcdff3aa8b87aa61ac06ac9edb
2024-02-29 12:53:07 +00:00
Spandan Das
df036b4b55 Merge "Ignore prebuilt apexes if PRODUCT_MODULE_BUILD_FROM_SOURCE is true" into main 2024-02-29 08:01:24 +00:00
Daniel Zheng
247a6215fa Merge "fallback on older cow version" into main am: 4fc7815094 am: 9af982c4cf
Original change: https://android-review.googlesource.com/c/platform/build/+/2982349

Change-Id: I5cea82a3842035e3d9f74c1e0e7036db40936a0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 05:19:42 +00:00
Treehugger Robot
4df2a46751 Merge "Define PRODUCT_SHIPPING_VENDOR_API_LEVEL" into main am: be94153266 am: 76670ce735
Original change: https://android-review.googlesource.com/c/platform/build/+/2980493

Change-Id: Ib84081d531572ee742d879aaff52f08e37465789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 05:19:13 +00:00
Daniel Zheng
9af982c4cf Merge "fallback on older cow version" into main am: 4fc7815094
Original change: https://android-review.googlesource.com/c/platform/build/+/2982349

Change-Id: I29b2ca63b0e52184f3885272a1da98a0e25cbb7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 04:59:38 +00:00
Daniel Zheng
4fc7815094 Merge "fallback on older cow version" into main 2024-02-29 04:49:16 +00:00
Daniel Zheng
474afa8f06 fallback on older cow version
If a device's source or target cow version is specified at 2 (or
undefined) we should fallback on using the v2 writer.

e.g.
1. v3 -> v2 downgrade OTA
2. v2 -> v3

Bug: 322279333
Test: ota_from_target_files
Change-Id: I8c5139eceeb64ee255ddea66017b3e17bbdc44c0
2024-02-28 20:47:20 -08:00
Treehugger Robot
76670ce735 Merge "Define PRODUCT_SHIPPING_VENDOR_API_LEVEL" into main am: be94153266
Original change: https://android-review.googlesource.com/c/platform/build/+/2980493

Change-Id: I1d3c2de54819a56dda023489a27920e9c87a1528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 04:37:59 +00:00
Treehugger Robot
be94153266 Merge "Define PRODUCT_SHIPPING_VENDOR_API_LEVEL" into main 2024-02-29 03:51:52 +00:00
Alyssa Ketpreechasawat
74dabedcb3 Use build flag to control the apex boot jars to be excluded.
Different prebuilts might have different contents and thus, different
boot jars to be removed from the existing apex boot jar lists e.g. next
using U prebuilts would need to remove framework-pdf while ap31 with V
prebuilts must not remove such. The existing mechanism will always
remove framework-pdf whenever prebuilts are enabled regardless of
release config, which is not correct in context of multiple prebuilt
support.

Ignore-AOSP-First: for successful build, we need to submit this togther with ag/26332775. this cl will get cp'ed into aosp later on
Bug: 327022391
Test: build device in next and trunk
Merged-In: I9949fb7075ab6c207a292f13fd75e010a4958f87
Change-Id: I9949fb7075ab6c207a292f13fd75e010a4958f87
2024-02-29 02:26:44 +00:00
Alyssa Ketpreechasawat
3a8287e6be Merge "Use build flag to control the apex boot jars to be excluded." into main 2024-02-29 01:54:19 +00:00
Android Build Coastguard Worker
6a42284072 Make change and version bump to AP2A.240229.001
Snap for 11510485 from cd8800fec2 to 24Q2-release

Change-Id: I1fcac43512cb80a2ec7acc7023abcb667ea752ce
2024-02-29 00:48:48 +00:00
Dennis Shen
5c926ea2a7 Merge "aconfig_storage: move storage files to <partition>/etc/aconfig dir" into main am: 1eb16c12f2 am: fe06f890cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2982351

Change-Id: I7fc0a6e4441105183de0fac369499119826d068d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 23:53:31 +00:00
Wei Li
5dd61f03ff Add meta-lic.mk for declaring license metadata of some 1P files.
The 1p files are included in PRODUCT_COPY_FILES and released with products.

Bug: 316805918
Test: CIs
Change-Id: Ibe443af26fb14c1bd84552c9f327a1c2ba8c70a4
2024-02-28 15:15:42 -08:00
Dennis Shen
fe06f890cd Merge "aconfig_storage: move storage files to <partition>/etc/aconfig dir" into main am: 1eb16c12f2
Original change: https://android-review.googlesource.com/c/platform/build/+/2982351

Change-Id: I54cdff0c3d062de39dd4e4754af201167dbefba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 23:13:50 +00:00
Dennis Shen
1eb16c12f2 Merge "aconfig_storage: move storage files to <partition>/etc/aconfig dir" into main 2024-02-28 22:23:05 +00:00
Alyssa Ketpreechasawat
06c53db3e5 Use build flag to control the apex boot jars to be excluded.
Different prebuilts might have different contents and thus, different
boot jars to be removed from the existing apex boot jar lists e.g. next
using U prebuilts would need to remove framework-pdf while ap31 with V
prebuilts must not remove such. The existing mechanism will always
remove framework-pdf whenever prebuilts are enabled regardless of
release config, which is not correct in context of multiple prebuilt
support.

Ignore-AOSP-First: for successful build, we need to submit this togther with ag/26332775. this cl will get cp'ed into aosp later on
Bug: 327022391
Test: build device in next and trunk
Change-Id: I9949fb7075ab6c207a292f13fd75e010a4958f87
2024-02-28 21:21:10 +00:00
Spandan Das
ea0c5565db Ignore prebuilt apexes if PRODUCT_MODULE_BUILD_FROM_SOURCE is true
Some devices would like to use sources of mainline modules
even in next builds. This CL uses PRODUCT_MODULE_BUILD_FROM_SOURCE to
ignore the apex_contributions specified in the shared google_device's next.scl

Long term, this will be implemented by creating a product specific
release config map for this family of devices

Test: lunch <device>_fullmte-next-userdebug && m nothing
Bug: 325666427
Ignore-AOSP-First: The CL touches an internal only allowlist
Change-Id: I0cabba5faa4535dcdff3aa8b87aa61ac06ac9edb
2024-02-28 19:40:26 +00:00
Dennis Shen
bebbf54aa0 aconfig_storage: move storage files to <partition>/etc/aconfig dir
Move them to under aconfig dir so it is easier to define SELinux policy.

Bug: b/312459182
Test: m
Change-Id: I2af7167a21e004729a9ac8628243080c893fb33a
2024-02-28 17:39:21 +00:00
Dennis Shen
cd8800fec2 Merge "aconfigd: add aconfigd to system partition" into main am: 40922cb75b am: 04cfe63844
Original change: https://android-review.googlesource.com/c/platform/build/+/2974532

Change-Id: Ib1eeed4e7b12a28565b30ea2ba061ada6ad15b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 14:02:33 +00:00
Jordan Demeulenaere
f64fa19c4f Remove SystemUI Compose build flag (1/4)
This CL removes the SYSTEMUI_USE_COMPOSE build flag, which is now
enabled by default on all SystemUI variants.

Bug: 295304993
Test: mp droid
Ignore-AOSP-First: Flag was introduced in internal tree in
  ag/20785186
Change-Id: I2f2b6b66262eefe2f0b0821773fda4cc07526d7b
2024-02-28 14:55:23 +01:00
Dennis Shen
04cfe63844 Merge "aconfigd: add aconfigd to system partition" into main am: 40922cb75b
Original change: https://android-review.googlesource.com/c/platform/build/+/2974532

Change-Id: I341d383ba6c8cf548931542a2d709fa7bc5fe12f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 13:21:35 +00:00
Dennis Shen
40922cb75b Merge "aconfigd: add aconfigd to system partition" into main 2024-02-28 12:31:26 +00:00
Kadir Çetinkaya
1ce53fdebd Merge "Add CC analysis support to ide_query" into main am: 1ffcbde28e am: 2d708e5467
Original change: https://android-review.googlesource.com/c/platform/build/+/2966444

Change-Id: I8ceb4758384ed9bce5d65dca4af9ca07cfc6d7aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 12:14:34 +00:00
Justin Yun
000e31c9ed Define PRODUCT_SHIPPING_VENDOR_API_LEVEL
Devices may set its first vendor api level to
PRODUCT_SHIPPING_VENDOR_API_LEVEL. This will manually set to
ro.vendor.api_level and will be used by tests.

If this value is not defined, init process will automatically
calculate the ro.vendor.api_level property for tests.

Bug: 326164316
Test: Check vendor/build.prop
Change-Id: I89f844ffaad9e3e39deab1c680bd1f7f17f4d8ad
2024-02-28 21:01:40 +09:00
Kadir Çetinkaya
2d708e5467 Merge "Add CC analysis support to ide_query" into main am: 1ffcbde28e
Original change: https://android-review.googlesource.com/c/platform/build/+/2966444

Change-Id: Ifa22e00c3c57e889f125a73ffbe1d09975de53ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 11:34:08 +00:00
Kadir Çetinkaya
1ffcbde28e Merge "Add CC analysis support to ide_query" into main 2024-02-28 10:41:19 +00:00
Treehugger Robot
65428f5ad9 Merge "Add custom images in fastboot-info" into main am: 0d25dfc3a4 am: ce00eff465
Original change: https://android-review.googlesource.com/c/platform/build/+/2957065

Change-Id: I274b7ae845db0d147d0c8e5b7d43215d51b171a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 08:54:09 +00:00
Treehugger Robot
ce00eff465 Merge "Add custom images in fastboot-info" into main am: 0d25dfc3a4
Original change: https://android-review.googlesource.com/c/platform/build/+/2957065

Change-Id: Ifcf434dbb19936e171b8399b3d11a81c0b5169a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 08:13:05 +00:00
Treehugger Robot
0d25dfc3a4 Merge "Add custom images in fastboot-info" into main 2024-02-28 07:26:45 +00:00
Kadir Çetinkaya
0769200450 Add CC analysis support to ide_query
Introduces ide_query_cc_analyzer, which figures out relevant build targets that needs to be built for a given C++ source or header file.
Once these targets are built, it analyzes the sources in question and reports any generated files that are used back.

Full ide_query integration relies on this binary also being available in prebuilts clang-tools, it'll be done in a future patch.

Change-Id: Ib0ef6da7a2bc8ecf66940b326e037fb1ee230bf9
2024-02-28 07:14:15 +00:00
Peter Collingbourne
7c508f5f1a Merge "Create empty /linkerconfig/ld.config.txt in ramdisk." into main am: 81f8ba86f3 am: 145e62cfad
Original change: https://android-review.googlesource.com/c/platform/build/+/2974335

Change-Id: I51dba946c2dcdb8118ad505559f61a8ce5f256e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 03:45:54 +00:00
Peter Collingbourne
145e62cfad Merge "Create empty /linkerconfig/ld.config.txt in ramdisk." into main am: 81f8ba86f3
Original change: https://android-review.googlesource.com/c/platform/build/+/2974335

Change-Id: I0416e53990a789f1a09a5f842d340b87f6c56399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 03:05:01 +00:00
Peter Collingbourne
81f8ba86f3 Merge "Create empty /linkerconfig/ld.config.txt in ramdisk." into main 2024-02-28 02:09:15 +00:00
Android Build Coastguard Worker
d8ab7a020c Make change and version bump to AP2A.240228.001
Snap for 11504324 from 8c84478760 to 24Q2-release

Change-Id: Id4b118041d6943f677397506e51ba7faaf2ef403
2024-02-28 00:48:02 +00:00
Carmen Jackson
8c84478760 Merge "Use Profiling flag at build time" into main 2024-02-27 17:40:09 +00:00
Sergei Makarov
eb0e3440bc Merge "Rename ContactKeysProvider to E2eeContactKeysProvider." into main 2024-02-27 17:16:33 +00:00
Carmen Jackson
4889c99c39 Use Profiling flag at build time
This change puts base_system and default_art_config references to
the profiling module behind the build flag.

It also adds the flag to soong_config_vars so it can be referenced
from the Profiling module and from platform_bootclasspath.

Bug: 293957254
Bug: 325523640
Test: Built locally on trunk_food (where flag is disabled) and
trunk_staging (where flag is enabled.)
Ignore-AOSP-First: Must be submitted in topic with internal-only
changes.

Change-Id: I51cfa65ff607753cc8c588793ea381419ac99260
2024-02-27 06:43:55 +00:00
Android Build Coastguard Worker
6b11133633 Version bump to AP2A.240227.002 [core/build_id.mk]
Change-Id: Ie4f9e17de75f187bcdbbafa8c9aa760f953348d4
2024-02-27 03:50:08 +00:00
Android Build Coastguard Worker
30fe1ab300 Make change and version bump to AP2A.240227.001
Snap for 11498394 from 5c93dbdfb9 to 24Q2-release

Change-Id: I58cd9a41525d4c9b6ad0cc11387645b4d90de40d
2024-02-27 03:25:54 +00:00
Devin Moore
6df2f8f647 Vendor API level 202404 is now frozen
Update the state to 'vintf' so we don't try to re-finalize the same
level.

Ignore-AOSP-First: VINTF 202404 Finalization
Bug: 279809333
Test: build
Change-Id: I06530eedaeb69cc9d4a9b3af5b91a101ab2eab7d
2024-02-27 00:04:50 +00:00
Android Build Coastguard Worker
43f84fb6c6 Version bump to AP2A.240226.002 [core/build_id.mk]
Change-Id: I7502270da89b683f618effe8d62aed53c1516676
2024-02-27 00:00:53 +00:00
Android Build Coastguard Worker
808024766d [coastguard skipped] Merge sparse cherrypicks from sparse-11494863-L07100030002139341 into 24Q2-release.
COASTGUARD_SKIP: I62e3c0369aa26467544a0c9cf5989f9989a98ae6

Change-Id: I7de880555adf93b8dfd4d8f9c7edda08d1bcf1c9
2024-02-26 04:44:45 +00:00