Commit Graph

35562 Commits

Author SHA1 Message Date
David Iserovich
babdafe97e [config] Dist supports custom super image script
Some boards need to supply a custom super image script, and this
is supported via the BOARD_CUSTOM_BUILD_SUPER_IMAGE variable.

However, this variable is not used by img_from_target_files.py.

Change img_from_target_files.py to call the supplied script.

Bug: None
Change-Id: I6bca937534f58459d3419139ee7a37a10138ab8f
2023-08-10 18:12:44 +00:00
Greg Kaiser
f5eaf3cff3 Give an error when trying to build "next" targets
The "next" targets aren't supported yet, so we want to fail
immediately.

If the environment variable TESTING_TARGET_RELEASE_NEXT is
set, then we'll allow a "next" build, so folks can work on
fixing this in the meantime.

Bug: 294161396
Test: "lunch mokey-next-userdebug" with and without TESTING_TARGET_RELEASE_NEXT set
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f40be02ee51dec1bd5cdf88a4419684585ef6ef3)
Change-Id: If478a4efef937a0a986bfefdb61cc25921863b25
2023-08-10 16:26:12 +00:00
Wei Li
bf40796a32 Merge "Include flags files in product SBOM." into main am: 1c950f7a76
Original change: https://android-review.googlesource.com/c/platform/build/+/2700093

Change-Id: I0c62e7047e286352925512978a468bbe1cc36789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 22:20:24 +00:00
Wei Li
1c950f7a76 Merge "Include flags files in product SBOM." into main 2023-08-09 21:28:54 +00:00
Juan Yescas
d94d6bc9ad core: Rename product variable Device_page_size_agnostic
The product variable Device_page_size_agnostic will be
renamed to DevicePageSizeAgnostic.

Test: source build/envsetup.sh
      lunch aosp_cf_arm64_phone_pgagnostic
      m
Bug: 289419664
Change-Id: I4c0026a559ca3d848ccad285a5516a56d01c0efb
2023-08-09 09:04:43 -07:00
Devin Moore
7519e1065e Merge "Let assemble_vintf create the output fragments" into main am: aea0819fc7
Original change: https://android-review.googlesource.com/c/platform/build/+/2681229

Change-Id: I7dcfcd1fe82e45a5233e9a32c8b5b8550ce221f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 16:01:38 +00:00
Devin Moore
aea0819fc7 Merge "Let assemble_vintf create the output fragments" into main 2023-08-09 15:29:05 +00:00
Wei Li
9b4cf43335 Include flags files in product SBOM.
Bug: 272358980
Test: build/soong/tests/sbom_test.sh
Change-Id: Ifcb2f26044c346c54e60d1d4fb85fc4001f64210
2023-08-08 17:26:49 -07:00
Treehugger Robot
7ec1b82eef Merge "Remove duplicate in unbundled build moduels defined in TARGET_BUILD_APPS." into main am: 8c656ae6f8
Original change: https://android-review.googlesource.com/c/platform/build/+/2698935

Change-Id: Iaa468455fde8a56470df9c2e05f9803ea97e6fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 00:11:19 +00:00
Wei Li
604ab2f175 Remove duplicate in unbundled build moduels defined in TARGET_BUILD_APPS.
Bug: 294786322
Test: banchan com.android.adbd com.android.adbd module_arm64 userdebug && m sbom
Change-Id: I60c403d530299741d6250b816095eafedf5bcd3d
2023-08-08 13:59:55 -07:00
Treehugger Robot
347d796919 Merge "Clean up after ourselves in the Rust Benchmark Template" into main am: cadce2a071
Original change: https://android-review.googlesource.com/c/platform/build/+/2698157

Change-Id: I066ff370aee9f3395a72baed649ee6a84440a8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 18:37:01 +00:00
Jim Shargo
980052abf6 Clean up after ourselves in the Rust Benchmark Template
There's a compliance check for tradefed that ensures that configs for
tests are set to cleanup after themselves. See: https://cs.android.com/android/platform/superproject/main/+/main:tools/tradefederation/core/javatests/com/android/tradefed/presubmit/GeneralTestsConfigValidation.java;l=425-429;drc=1fb7fe35bf7c843b5bac510476d63e4c8b436a48

This causes new benchmarks to fail presubmits.

Test: CLs with rust benchmarks pass presubmits now
Change-Id: I14f64ee3343bcf9bd2d77f547dc16b9c15bf4082
2023-08-08 16:57:42 +00:00
Android Build Coastguard Worker
8f0289071e Version bump to UP1A.230905.015 [core/build_id.mk]
Change-Id: I07c1fd7806e63adef5c0e0a738716ee628d82e1c
2023-08-05 00:21:39 +00:00
Android Build Coastguard Worker
5f3df579de Version bump to UP1A.230905.014 [core/build_id.mk]
Change-Id: I69dfb3d099fb6e030ccf71f6afe1fb463f6a361e
2023-08-04 01:42:16 +00:00
Android Build Coastguard Worker
360a0ae0ee Version bump to UP1A.230905.013 [core/build_id.mk]
Change-Id: Ibef8e42df50362418e25b00e9d2a14b743126bec
2023-08-03 01:48:09 +00:00
Treehugger Robot
f39e594799 Merge "Minify the sdk targets" into main am: 392398cd40
Original change: https://android-review.googlesource.com/c/platform/build/+/2690448

Change-Id: I497ce6419ef401968b50405e005799ccbe0e4dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 00:12:09 +00:00
Cole Faust
92d921ce24 Minify the sdk targets
Previously, the "sdk" target was a minimal lunch target that only
included enough to build the sdk. But the "sdk_<arch>" targets
redirected to the "sdk_phone_<arch>" targets, which are much bigger
and capable of building a whole emulator.

Building the sdk on products that can build a whole device complicates
the rest of the build system (for example, it starts enforcing dexpropt
works)

Bug: 290798660
Test: m sdk dist sdk_repo device-tests platform_tests on sdk_x86_64-userdebug
Change-Id: I76f38cf19172a5f5fae423175d5e03670137a0df
2023-08-02 15:36:59 -07:00
Pierre-Clément Tosi
4e1f71ff7e Makefile: Avoid packaging pvmfw.bin in /system
Test: TH # In particular, make sure that b/261393794 isn't back.
Bug: 294177504
Change-Id: I1111ffb4a9e130568375329500c97eb850c0bfa1
2023-08-02 11:40:29 +01:00
Treehugger Robot
3aad1523a7 Merge "Revert "Revert "Add system staging dir stamp file for bazel sand..."" into main am: 8cad379e98
Original change: https://android-review.googlesource.com/c/platform/build/+/2686910

Change-Id: I03200fefa15b397a3980b90acf54d5fa676346c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 04:46:46 +00:00
Treehugger Robot
8cad379e98 Merge "Revert "Revert "Add system staging dir stamp file for bazel sand..."" into main 2023-08-02 04:11:10 +00:00
Treehugger Robot
b38245f203 Merge "Add the option for custom_image to be AVB or NONAVB" into main am: d5474ac3da
Original change: https://android-review.googlesource.com/c/platform/build/+/2643431

Change-Id: I8dcf0278278556992d5ef1a3f2f3f10f63a771c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 20:13:23 +00:00
Treehugger Robot
d5474ac3da Merge "Add the option for custom_image to be AVB or NONAVB" into main 2023-08-01 19:08:06 +00:00
Cole Faust
4ad906d6a4 Revert "Revert "Add system staging dir stamp file for bazel sand..."
Revert submission 2685589-revert-2651299-bazel_sandwich-TVXWOASJNU

Reason for revert: It was not the cause of b/293883239

Reverted changes: /q/submissionid:2685589-revert-2651299-bazel_sandwich-TVXWOASJNU

Change-Id: I98ca2be7490a4e38d35e4e640a0d027711b67030
2023-08-01 16:38:58 +00:00
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
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
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
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
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
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
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
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