Commit Graph

35817 Commits

Author SHA1 Message Date
Jooyung Han
713a5e79e1 Merge "Revert "Add system staging dir stamp file for bazel sandwich"" into main am: 068da3ef96
Original change: https://android-review.googlesource.com/c/platform/build/+/2685589

Change-Id: I7cd80c86d092f6803489b928f9b0777001d94a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 07:23:21 +00:00
Jooyung Han
068da3ef96 Merge "Revert "Add system staging dir stamp file for bazel sandwich"" into main 2023-08-01 06:50:26 +00:00
Jooyung Han
f6a2234a54 Revert "Add system staging dir stamp file for bazel sandwich"
Revert submission 2651299-bazel_sandwich

Reason for revert: b/293883239, checking if this breaks the build.

Reverted changes: /q/submissionid:2651299-bazel_sandwich

Change-Id: I40661772148434adf5fbec9568b4c303ff7eaf1c
2023-08-01 05:15:28 +00:00
Android Build Coastguard Worker
dc3a78c5e3 Version bump to UP1A.230905.012 [core/build_id.mk]
Change-Id: Ie60a7eabec86ee2e1982c897042a56490cb02ca3
2023-08-01 01:10:09 +00:00
Treehugger Robot
6c80cd6cc5 Merge "Add system staging dir stamp file for bazel sandwich" into main am: e88ddaecc9 am: f0ebc2f667
Original change: https://android-review.googlesource.com/c/platform/build/+/2651320

Change-Id: Ie6b8c7a7f4cd894676a84ae3049ca5696868dc20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 23:52:37 +00:00
Treehugger Robot
f0ebc2f667 Merge "Add system staging dir stamp file for bazel sandwich" into main am: e88ddaecc9
Original change: https://android-review.googlesource.com/c/platform/build/+/2651320

Change-Id: I56ff990c05c99824cdea49922194ea04bc8e76d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 23:08:03 +00:00
Treehugger Robot
e88ddaecc9 Merge "Add system staging dir stamp file for bazel sandwich" into main 2023-07-31 23:00:55 +00:00
Devin Moore
c33aec868b Let assemble_vintf create the output fragments
Instead of checking, then copying the fragments into the out directory,
we pass in the output file and let assemble_vintf create the output
file.

Test: m
Bug: 290265210
Change-Id: I65c2ee826de73b805b48dc95f20c2405250587f8
2023-07-31 16:10:59 +00:00
Android Build Coastguard Worker
50c175ab6c Version bump to UP1A.230905.011 [core/build_id.mk]
Change-Id: Ib2682f641e7cce37e89b74a5f34ef3db85c18732
2023-07-29 06:37:02 +00:00
Android Build Coastguard Worker
5d4c5e1fa0 Version bump to UP1A.230905.010 [core/build_id.mk]
Change-Id: I4ae0fc88a8a1d95186d862f65978de127bfce917
2023-07-28 01:53:47 +00:00
Cole Faust
82222146ee Add system staging dir stamp file for bazel sandwich
This stamp file is an alias to request that the system staging directory
be built. The bazel sandwich cannot know the full list of files in the
staging directory at analysis time, so it will just depend on this
instead, and then find all the files in the staging dir at execution
time.

Bug: 265127181
Test: m bazel_sandwich
Change-Id: Iee3dff4f77c9e7054b4e8297e5d96b4ef8bf1cbb
2023-07-27 10:14:36 -07:00
Juan Yescas
7563d87c89 Merge "16k: core: Check that TARGET_MAX_PAGE_SIZE_SUPPORTED is greater than 4096 only for ARM archs." into main am: e74d66b42f am: 59d2fb49c7
Original change: https://android-review.googlesource.com/c/platform/build/+/2676499

Change-Id: Ic9f3a03a16501c8d2cb02dbfd336dfbc07fa2a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 15:24:01 +00:00
Juan Yescas
59d2fb49c7 Merge "16k: core: Check that TARGET_MAX_PAGE_SIZE_SUPPORTED is greater than 4096 only for ARM archs." into main am: e74d66b42f
Original change: https://android-review.googlesource.com/c/platform/build/+/2676499

Change-Id: I22d9c314fb105fee54015b4a7aa2c1ec83cefab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 14:42:30 +00:00
Android Build Coastguard Worker
a2ab99263a Version bump to UP1A.230905.009 [core/build_id.mk]
Change-Id: I0da63b664d45f01f977ab45f47b32923f76dedd3
2023-07-27 01:42:45 +00:00
Juan Yescas
6196841f4d 16k: core: Check that TARGET_MAX_PAGE_SIZE_SUPPORTED is greater than 4096 only for ARM archs.
For arm archs, PRODUCT_MAX_PAGE_SIZE_SUPPORTED  values can be 4096, 16384, 65536.
For other archs, PRODUCT_MAX_PAGE_SIZE_SUPPORTED can only be 4096.

Note: The linker flag max-page-size is configured by PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag.

Bug: 289419664

Test: source build/envsetup.sh
      lunch aosp_cf_x86_64_phone
      build/make/core/config.mk:448: error: TARGET_MAX_PAGE_SIZE_SUPPORTED=65536 is greater than 4096. Only supported in ARM arch.

      source build/envsetup.sh
      lunch aosp_raven_64-userdebug

Change-Id: I887d6f12835f1bea4c6b92d7d836440b8d3fd6a8
2023-07-27 00:13:50 +00:00
Devin Moore
60e761b620 Merge "Add new Release_aidl_use_unfrozen soong variable" into main am: 11db0915df am: 231775ee04
Original change: https://android-review.googlesource.com/c/platform/build/+/2650298

Change-Id: I1cf0bb8c645c8e33b71fd6121f57d0365cc96aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 23:03:28 +00:00
Devin Moore
231775ee04 Merge "Add new Release_aidl_use_unfrozen soong variable" into main am: 11db0915df
Original change: https://android-review.googlesource.com/c/platform/build/+/2650298

Change-Id: Ic27d05916da72e9ba52cc57b1e3bd7788380b048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 22:15:32 +00:00
Devin Moore
11db0915df Merge "Add new Release_aidl_use_unfrozen soong variable" into main 2023-07-26 21:42:52 +00:00
Ray-cy.lee
e97e0cb16b Add the option for custom_image to be AVB or NONAVB
Check BOARD_AVB_$(call to-upper,$(partition))_KEY_PATH to decide whether custom_image should sign AVB or not. If key path isn't set, the custom image will be excluded from AVB and copied to /IMAGES in target-files directly. This allows vendor to use custom_images flow packing unsigned image.
And to every non-avb custom partition, one image whose name is partition name must be added in its BOARD_<CUSTOM_PARTITION>_IMAGE_LIST.

BOARD_CUSTOMIMAGES_PARTITION_LIST := tvconfig
BOARD_TVCONFIG_IMAGE_LIST := \
    device/xxxx/yyyy/tvconfig.img \
    device/xxxx/yyyy/tvconfig_custom1.img

Test:
1) Build image, target-files, OTA package by m and m dist
2) Sign images by sign_target_files_apk.py

Fix: 285227850
Change-Id: I7477dafe023e4b168f0f08fb7aedd9e511a60e1b
2023-07-26 20:21:29 +08:00
Jooyung Han
826d9cea5d Merge "Support .(dot) files in root" into main am: 68b4cbecb9 am: 4609692b9d
Original change: https://android-review.googlesource.com/c/platform/build/+/2674735

Change-Id: I98e11ba22de02734a507a60ce60cb55dacf068f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 02:30:25 +00:00
Treehugger Robot
3b524559ec Merge "Support transitive resource packages from Soong" into main am: 08d991834d am: 203570fb65
Original change: https://android-review.googlesource.com/c/platform/build/+/2637629

Change-Id: I7373d6e8f37cbc8203f51bac36b69456d42df070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 01:45:10 +00:00
Jooyung Han
4609692b9d Merge "Support .(dot) files in root" into main am: 68b4cbecb9
Original change: https://android-review.googlesource.com/c/platform/build/+/2674735

Change-Id: I5bc509ab9bacff3f8311849ec9b92178526cf78d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 01:22:53 +00:00
Treehugger Robot
203570fb65 Merge "Support transitive resource packages from Soong" into main am: 08d991834d
Original change: https://android-review.googlesource.com/c/platform/build/+/2637629

Change-Id: I72c029d945b79d5683c0419af7ab2cd091d4de86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 01:22:26 +00:00
Jooyung Han
68b4cbecb9 Merge "Support .(dot) files in root" into main 2023-07-26 01:00:19 +00:00
Android Build Coastguard Worker
5784d1de09 Version bump to UP1A.230905.008 [core/build_id.mk]
Change-Id: Idbaceb6d8d6fb7f9ac30ddcc6fd83e3d86f7a296
2023-07-26 00:57:41 +00:00
Treehugger Robot
08d991834d Merge "Support transitive resource packages from Soong" into main 2023-07-26 00:34:57 +00:00
Colin Cross
d9d5c2a95e Support transitive resource packages from Soong
Soong is improving resource handling by not squashing resources from
all dependencies into every android_library.  This causes problems
when the android_library is exported to Make, as Make is still using
the old squashing behavior.

Add a file to every static java library that lists the resource packages
of its transitive dependencies.  For modules defined in Andorid.mk files
leave the file empty, but for Soong modules populate it with the list
of transtiive dependencies.  Pass the contents all of the files from
direct dependencies to aapt2 link to include any transitive dependencies.

Bug: 284023594
Test: m Dialer
Change-Id: I4e8ace497d701a9645a62dd5a6ac12e9a6830dcf
Merged-In: I4e8ace497d701a9645a62dd5a6ac12e9a6830dcf
2023-07-25 21:30:38 +00:00
Juan Yescas
ccc0449a88 Merge "16k: core: Add flag to make AOSP page size agnostic" into main am: a5043704ed am: 9d4b3b86e9
Original change: https://android-review.googlesource.com/c/platform/build/+/2657937

Change-Id: I06cbd1dc5a4756da03070d29738c014038c3636a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 15:37:37 +00:00
Juan Yescas
9d4b3b86e9 Merge "16k: core: Add flag to make AOSP page size agnostic" into main am: a5043704ed
Original change: https://android-review.googlesource.com/c/platform/build/+/2657937

Change-Id: I8997a07faf2e295011a7fc67a5c1e1f9f21b5a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 14:57:04 +00:00
Paul Duffin
1b61260a16 Support prebuilts for Go am: fa2b8b1567
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24151504

Change-Id: Ife9a700a290369da5d44a16cd5fc0431596a03ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 08:58:59 +00:00
Jooyung Han
8d72515292 Support .(dot) files in root
When .(dot) file/dir is added to the rootdir, it works with normal `m
systemimage` build, but fails when building the images with target
files because the copy command misses .(dot) files.

When packaging, need to copy the whole content from the src directory.
This also matches the condition `ls -A` (which means, we care about dot
files as well).

Bug: 292438323
Test: m dist (aosp_cf_x86_64_phone-userdebug)
Change-Id: Ib3f555305c915d499448c2064e5639a641b2ddb7
2023-07-25 13:58:19 +09:00
Android Build Coastguard Worker
62ab41901c Version bump to UP1A.230905.007 [core/build_id.mk]
Change-Id: I0cacb31f2a38d9763b0f33f947057afffa0999c1
2023-07-25 02:11:04 +00:00
Juan Yescas
1083f36818 16k: core: Add flag to make AOSP page size agnostic
The new boolean flag will be PRODUCT_PAGE_SIZE_AGNOSTIC.

When PRODUCT_PAGE_SIZE_AGNOSTIC is true:

- AOSP will use getpagesize() to retrieve the page size.
- The flag `TARGET_MAX_PAGE_SIZE_SUPPORTED` has to be equals to `65536`.
- AOSP will be able to use 4k/16k page size Linux kernels

When PRODUCT_PAGE_SIZE_AGNOSTIC is false:

- AOSP will only support 4k page size kernels.

Test: source build/envsetup.sh
      lunch aosp_raven_64-userdebug
      get_build_var TARGET_PAGE_SIZE_AGNOSTIC
      get_build_var PRODUCT_MAX_PAGE_SIZE_SUPPORTED
      65536

      source build/envsetup.sh
      lunch aosp_raven_64-userdebug
      build/make/core/config.mk:414: error: TARGET_MAX_PAGE_SIZE_SUPPORTED has to be 65536 to support page size agnostic.
      10:32:55 dumpvars failed with: exit status 1

Bug: 289419664
Change-Id: If8fc243a3e2cad77414a53a29805c7b6d349d4dd
2023-07-24 13:48:52 -07:00
Liz Kammer
be804aaf98 Merge "Allow setting some build_broken out of boardconfig" into main am: 36c619075e am: 5acec2b75f
Original change: https://android-review.googlesource.com/c/platform/build/+/2636512

Change-Id: Ibe1f940e3ea7f14cca08dad6219c1573a3c6bbcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 15:05:31 +00:00
Liz Kammer
5acec2b75f Merge "Allow setting some build_broken out of boardconfig" into main am: 36c619075e
Original change: https://android-review.googlesource.com/c/platform/build/+/2636512

Change-Id: I302712a7a8229e9b85f53356fe00bedc3ce91c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 14:44:27 +00:00
Liz Kammer
36c619075e Merge "Allow setting some build_broken out of boardconfig" into main 2023-07-24 14:24:25 +00:00
Android Build Coastguard Worker
7222ee5fac Version bump to UP1A.230905.006 [core/build_id.mk]
Change-Id: I75a11f1560958aa753d46c612314d3ec6431f757
2023-07-23 10:51:35 +00:00
Liz Kammer
b607281fae Allow setting some build_broken out of boardconfig
Some build broken flags are for cross-cutting features rather than
board-specific. In order to support these without requiring broad
changes across many board configs, these can be set in a buildspec.mk
files.

Test: set build_broken flags in environment, get expected fail
Test: set build_broken flags in buildspec, get expected success
Change-Id: I8a74c30575f6bf40e46281ca5f37f3cfed526ec5
2023-07-21 15:51:58 -04:00
Treehugger Robot
0bb978473c Merge "Combine aconfig cache files into per-partition dumps." into main am: 21e6105b79 am: a8e2b20b71
Original change: https://android-review.googlesource.com/c/platform/build/+/2645008

Change-Id: Iac464f15fd2018202cdefb6f221eacf1870b9639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 15:07:10 +00:00
Treehugger Robot
a8e2b20b71 Merge "Combine aconfig cache files into per-partition dumps." into main am: 21e6105b79
Original change: https://android-review.googlesource.com/c/platform/build/+/2645008

Change-Id: I0cb06ef2c8f1a541c10dcf82c8950c8a8e3b17a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 14:46:31 +00:00
Treehugger Robot
21e6105b79 Merge "Combine aconfig cache files into per-partition dumps." into main 2023-07-21 14:34:44 +00:00
Paul Duffin
fa2b8b1567 Support prebuilts for Go
Previously, the build assumed that we only provided prebuilts for
Android Big devices and would build from sources for all others. This
change adds support for using prebuilts for Go.

Ignore-AOSP-First: Needed as part of large topic to add go prebuilts to udc-dev
Bug: 289303031
Test: m droid
Change-Id: I59f7ba15b0437fd4cc622f3de2582d999fb13c0d
2023-07-21 11:59:25 +01:00
Android Build Coastguard Worker
2f59c111b7 Make change and version bump to UP1A.230905.005
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23709440', 'googleplex-android-review.googlesource.com/23712489', 'googleplex-android-review.googlesource.com/24102492', 'googleplex-android-review.googlesource.com/24104319'] into udc-release.

Change-Id: I2b516f05011a76a032bc3fcbdbde22519e3cb4ed
2023-07-21 01:40:59 +00:00
Devin Moore
816167b93b Add new Release_aidl_use_unfrozen soong variable
This comes from a trunk stable build flag `RELEASE_AIDL_USE_UNFROZEN`
and is used by the AIDL compiler when creating build rules for the
generated AIDL libraries.

Test: m
Bug: 290265210

Change-Id: I9161a3262d6b2ef8792e8c0b8a759da9a540c560
2023-07-21 00:17:47 +00:00
Yi Kong
7ebddc1486 Merge "Remove dangling reference to LLVMgold.so" into main am: 7859cc45f7 am: 829f7e9de6
Original change: https://android-review.googlesource.com/c/platform/build/+/2665360

Change-Id: I187a71ad8d8a6091f3f4470eb9741f0c7248580c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 18:28:40 +00:00
David Fu
f7cccf6722 Merge "Added haiku-presubmit phony rule to makefile" into main am: 4c1bc5b9b7 am: efaab29fe3
Original change: https://android-review.googlesource.com/c/platform/build/+/2652359

Change-Id: Ia12b24f295b8af654752f6ee0244fd3d9e28266a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 18:28:22 +00:00
Yi Kong
829f7e9de6 Merge "Remove dangling reference to LLVMgold.so" into main am: 7859cc45f7
Original change: https://android-review.googlesource.com/c/platform/build/+/2665360

Change-Id: I36f43b3cf4dfec31128d3ba2093d96250551151e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 17:41:59 +00:00
David Fu
efaab29fe3 Merge "Added haiku-presubmit phony rule to makefile" into main am: 4c1bc5b9b7
Original change: https://android-review.googlesource.com/c/platform/build/+/2652359

Change-Id: Id57d4bd4de3363e42637122c3d05900f28639a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 17:41:42 +00:00
Yi Kong
7859cc45f7 Merge "Remove dangling reference to LLVMgold.so" into main 2023-07-20 17:33:54 +00:00
David Fu
4c1bc5b9b7 Merge "Added haiku-presubmit phony rule to makefile" into main 2023-07-20 17:00:05 +00:00