Commit Graph

36975 Commits

Author SHA1 Message Date
Cole Faust
b5f63e65d7 Merge "Add staging dir stamp files for all partitions" into main 2024-03-15 17:34:26 +00:00
Cole Faust
25a2aa8eea Add staging dir stamp files for all partitions
So they can be used from soong-built partitions.

Bug: 329146343
Test: Manually
Change-Id: I1d0d2f26ffeb60512368d02ce5c054f613f92230
2024-03-14 17:24:13 -07:00
Yu Liu
5e6cae4997 Merge "Validate aconfig libs are built with the correct modes." into main 2024-03-14 18:39:13 +00:00
Treehugger Robot
4e5aa5d0f5 Merge "Remove fs_get_stats." into main 2024-03-14 17:13:26 +00:00
Elliott Hughes
b904c27e12 Remove fs_get_stats.
This was only used by the tarball-building support that was removed
in 2019.

Test: treehugger
Change-Id: I719364699d426d21010c3ab913d12f15128f2538
2024-03-14 15:32:24 +00:00
Inseob Kim
51193b144c Add 202404 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 327954176
Test: m selinux_policy
Change-Id: Ic2d628785e8fb2882d16a1920115b6b925d2d4a1
2024-03-11 16:19:33 +09:00
LaMont Jones
318dafeca0 Look for release_config_map.mk in more projects
This allows us to split up build/release for better clarity.

Bug: b/328495189
Test: manual
Change-Id: If810780de164b74c3e3ebc35260384843de2c084
2024-03-08 12:02:15 -08:00
Jooyung Han
9738259f3e checkvintf with all apexes
Previously, checkvintf read only vendor apexes. Now, we support vintf
from other apexes.

Bug: 327365139
Test: m check-vintf-all
Change-Id: I46dc04ccdbe7d3f035ea9f63b1e45358ab31021b
2024-03-07 17:32:09 +09:00
Clinton Ke
8a65d66269 Merge "Revert "Move frameworks/base/Android.mk to build/tasks"" into main am: 3ac6614666
Original change: https://android-review.googlesource.com/c/platform/build/+/2990390

Change-Id: Icb3c8a629adb2b19e700af8c1a92cb1892ba2ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-06 04:21:11 +00:00
Clinton Ke
3ac6614666 Merge "Revert "Move frameworks/base/Android.mk to build/tasks"" into main 2024-03-06 03:47:30 +00:00
Nelson Li
3c3a6ab8d7 Revert "Move frameworks/base/Android.mk to build/tasks"
Revert submission 2988149-framework_library

Reason for revert: Broken build 11534795 on git_aosp-main-future on sdk-next-userdebug

Reverted changes: /q/submissionid:2988149-framework_library

Change-Id: I065ac8d664cc0e508c849c49e95a52b49d423083
Bug: 328325889
Bug: 328326210
2024-03-06 03:35:37 +00:00
Treehugger Robot
9b3e3df245 Merge "Move frameworks/base/Android.mk to build/tasks" into main am: fa31735f7f
Original change: https://android-review.googlesource.com/c/platform/build/+/2988149

Change-Id: Ie4671e24d218d748ec4dd3fbb6842cebcf214d2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-06 01:28:06 +00:00
Yu Liu
9e28f469d5 Validate aconfig libs are built with the correct modes.
Bug: 323071835
Test: Unit tests and manual tests.
Change-Id: I508be0433e11295608be0551222ae38b761b9214
2024-03-06 01:25:46 +00:00
Treehugger Robot
fa31735f7f Merge "Move frameworks/base/Android.mk to build/tasks" into main 2024-03-06 01:10:10 +00:00
Daniel Zheng
694d3438f9 Merge "Turn on V3 cow" into main am: c09a15f81f
Original change: https://android-review.googlesource.com/c/platform/build/+/2973761

Change-Id: I75c1d1ed70edcc249de967553de52522342b195a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-06 00:36:59 +00:00
Daniel Zheng
c09a15f81f Merge "Turn on V3 cow" into main 2024-03-05 23:04:46 +00:00
Elliott Hughes
b63961ff53 Merge "fs_config: remove -S option." into main am: a5c7819b34
Original change: https://android-review.googlesource.com/c/platform/build/+/2987371

Change-Id: I80d0ba528dedf8ce461e6d2f04c8a62484057583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 21:06:17 +00:00
Elliott Hughes
a5c7819b34 Merge "fs_config: remove -S option." into main 2024-03-05 20:05:16 +00:00
Daniel Zheng
7102baaf65 Turn on V3 cow
On all api levels shipping higher than 34 (pixel 8), we want to enable
v3 cow version of the cow format

We need to make this change in product_config.mk since PRODUCT variables
have special interactions with inherit-product. PRODUCT_SHIPPING_API_LEVEL
is defined in device.mk and is unavailable to the parent makefile
(PRODUCT vars are cleared at the beginning of makefiles?).
Having the fallback vabc_cow_version in this file allows us to avoid the
hack below (we would have to modify each device.mk to add a temporary variable)

alternate solution:

We have to create a new variable SHIPPING_API_LEVEL that is a duplicate
of PRODUCT_SHIPPING_API_LEVEL. This is a hack to workaround the
inheritance flow (since vabc_features.mk -> android_t_baseline.mk ->
device.mk).This hack allows this variable to be seen by the parent
.mk file

Bug: 313962438
Test: u->v upgrade path for pixel 8.  v->u dowgrade path for pixel 8
Change-Id: I6e1480e461c20a2fb07c5339828df0e6f6c0f9ec
2024-03-05 12:01:05 -08:00
Aditya Kumar
0553f97a63 Merge "Add CLANG_EXTERNAL_CFLAGS to both vendor and hardware directories" into main am: 9aa1265fbe
Original change: https://android-review.googlesource.com/c/platform/build/+/2947150

Change-Id: I2e7fafb70581996d3446ac8c99c2bf79df30dd70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 18:34:08 +00:00
Aditya Kumar
9aa1265fbe Merge "Add CLANG_EXTERNAL_CFLAGS to both vendor and hardware directories" into main 2024-03-05 17:50:10 +00:00
Nelson Li
589e3bc83c Move frameworks/base/Android.mk to build/tasks
1. Move the work of `declare-1p-copy-files` to `meta-lic.mk`.
2. Remove `$(LOCAL_PATH)/pathmap.mk` because the variables defined in
   it are no longer used.
3. The variable `ONE_SHOT_MAKEFILE` is deprecated and can be removed
   directly.
4. Move the main work of generating the targets `docs`,
   `offline-sdk-docs`, and `framework-doc-stubs` to
   `framework_library.mk`. Because Soong cannot specify the output
   to paths such as `$(OUT_DOCS)/` and
   `framework-doc-stubs-metadata_intermediates/`.
5. `ANDROID_BUILD_EMBEDDED` can theoretically be removed because the
   `.mk` files that use this variable are not currently in use, but
   since it involves many other files that are unrelated to this task,
   the work of removing this variable will be moved to other changes.

Bug: 322732227
Test: m docs offline-sdk-docs framework-doc-stubs
Change-Id: Ie51dbf88c78861fc60c6ba9c40542455e4cd4f55
2024-03-05 03:51:49 +00:00
Treehugger Robot
6215f7a4ed Merge "Enable the soong config namespace "camera" for all products" into main am: 8a93c78572
Original change: https://android-review.googlesource.com/c/platform/build/+/2984156

Change-Id: I96a21340ba4495a848820d24dea12cbecdc2a59e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 03:18:18 +00:00
Treehugger Robot
8a93c78572 Merge "Enable the soong config namespace "camera" for all products" into main 2024-03-05 02:48:25 +00:00
Herbert Xue
88bf02e7ee Enable the soong config namespace "camera" for all products
Bug: 327089038
Test: m google-camera-app-helper-prebuilt
Change-Id: If95c4c8be28295359c09aeb5d9ead1067e2da5ff
2024-03-05 10:45:05 +08:00
Thiébaud Weksteen
208c7381bc Merge "Add RELEASE_SELINUX_DATA_DATA_IGNORE flag" into main am: 61856ca3ed
Original change: https://android-review.googlesource.com/c/platform/build/+/2974812

Change-Id: I55e1786fc6e20530bc2fd50414b7fe2c5fde691c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 00:00:47 +00:00
Thiébaud Weksteen
61856ca3ed Merge "Add RELEASE_SELINUX_DATA_DATA_IGNORE flag" into main 2024-03-04 23:28:31 +00:00
Elliott Hughes
ad002facae fs_config: remove -S option.
mkfs warns about unknown "selabel=" fields, and this should be coming
from the file_contexts file, not here.

Test: treehugger
Change-Id: I63f3f616a2588438017e609a1a08c9dd7bf0c2ed
2024-03-04 21:20:52 +00:00
AdityaK
3bf7c4fc22 Add CLANG_EXTERNAL_CFLAGS to both vendor and hardware directories
Bug: b/323229700

Change-Id: I0c6f8fbbc061e713ddacbd44018a07c478f27bf0
2024-03-01 14:59:59 -08:00
Bart Van Assche
3bd214ae73 Merge "Makefile: Optimize the code for creating the kernel module list" into main am: a290c6caf8
Original change: https://android-review.googlesource.com/c/platform/build/+/2983201

Change-Id: Ib4809180c24ae9cdc3f5922de7eb48a78a27d0ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 23:51:47 +00:00
Bart Van Assche
a290c6caf8 Merge "Makefile: Optimize the code for creating the kernel module list" into main 2024-02-29 23:19:08 +00:00
Bart Van Assche
594180d8d0 Makefile: Optimize the code for creating the kernel module list
The time needed for executing shell code strongly depends on how many
times the shell has to call fork(). Hence, instead of invoking 'basename'
once per kernel module, invoke 'basename' once for all kernel modules.

Change-Id: Ibe322c8ebf0a466568f902beb5ab91988381678c
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2024-02-29 11:23:23 -08:00
Alyssa Ketpreechasawat
0f00fbd681 Merge "Use build flag to control the apex boot jars to be excluded." into main am: eb4f3ec4b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2980732

Change-Id: I658366663def6257d11c0a730ec874a0860f6aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 19:11:08 +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
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
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
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
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
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
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
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
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
Yi-Yo Chiang
5e8c4e77d2 Merge "Skip check_vintf_system_deps if not building system image" into main am: 0656d0a451
Original change: https://android-review.googlesource.com/c/platform/build/+/2973131

Change-Id: I8e8b02963e741743f6725596bcc07790728d0f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-26 03:23:47 +00:00
Yi-Yo Chiang
0656d0a451 Merge "Skip check_vintf_system_deps if not building system image" into main 2024-02-26 02:51:26 +00:00