Commit Graph

89516 Commits

Author SHA1 Message Date
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
Jiakai Zhang
134c808320 Merge "Add core-icu4j and consrypt to the ART boot image for testing." into main am: c07b049aba
Original change: https://android-review.googlesource.com/c/platform/build/+/2655207

Change-Id: Iac209f5e76eddc8abad22ecde668b4b00c422119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 18:04:09 +00:00
Jiakai Zhang
c07b049aba Merge "Add core-icu4j and consrypt to the ART boot image for testing." into main 2023-07-26 16:46:13 +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
Juan Yescas
a5043704ed Merge "16k: core: Add flag to make AOSP page size agnostic" into main 2023-07-25 14:24:40 +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
Kelvin Zhang
43df0805c2 Fix test failures in releasetools
new_path used before assignment, use `path` instead.

Bug: 280425458
Change-Id: I55086f92cf109af67032614cefde60e6478bb149
2023-07-24 13:16:03 -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
Liz Kammer
36c619075e Merge "Allow setting some build_broken out of boardconfig" into main 2023-07-24 14:24:25 +00:00
Treehugger Robot
e182021f83 Merge "aconfig: restructure integration tests" into main am: dce1fabf80
Original change: https://android-review.googlesource.com/c/platform/build/+/2672875

Change-Id: I3c9135982ff7ca258a2b9fa52cbd60f655564aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 14:22:42 +00:00
Treehugger Robot
dce1fabf80 Merge "aconfig: restructure integration tests" into main 2023-07-24 13:48:28 +00:00
Mårten Kongstad
af3da9d1be aconfig: restructure integration tests
Consolidate integration tests under tests/. Rename build targets to
follow the same pattern.

The important aconfig build targets are:

  - aconfig           : the aconfig binary
  - aconfig.test      : the aconfig unit tests
  - aconfig.test.java : the Java integration tests
  - aconfig.test.cpp  : the C++ integration tests
  - aconfig.test.rust : the Rust integration tests (not implemented yet)

Note: the Rust integration tests are blocked until the build system has
added support for aconfig Rust libraries.

Note: the flags used in the integration are not set correctly. A
follow-up CL will fix this.

Bug: 283911467
Test: atest aconfig.test.java aconfig.test.cpp
Change-Id: Idb8dad4c38a49231c2e89228775bacf065ee1f57
2023-07-24 13:05:43 +02: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
c943f4c1e5 Merge "Make aconfig c++ generate only one header and only one .cc file" into main am: 289fdf213a
Original change: https://android-review.googlesource.com/c/platform/build/+/2662943

Change-Id: Id1e64e2e7f57c24b8620b5684bf47e5d41f09d89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 19:16:33 +00:00
Treehugger Robot
289fdf213a Merge "Make aconfig c++ generate only one header and only one .cc file" into main 2023-07-21 19:09:30 +00:00
Joe Onorato
ac692c5eae Make aconfig c++ generate only one header and only one .cc file
Bug: 283479529
Test: m aconfig_hello_world_cc && adb push $TOP/out/target/product/panther/system/bin/aconfig_hello_world_cc /system/bin && adb shell aconfig_hello_world_cc
Change-Id: I1890aff70262343e18a62fb2efb2fd0e13a48fb2
2023-07-21 09:12:01 -07: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
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
Kelvin Zhang
0e7644ff06 Handle symlinks when extracting zipfiles
python3.11's zipfile implementation does not handle symlinks. This
causes important symlinks in ramdisk to be broken, and later causing a
boo failure.

Test: unzip a target files with symlinks, make sure symlinks are created
Bug: 287896098
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2b2de0375faf9e23094f6238c38f9a49906b1882)
Merged-In: Ia7d6ac8ffb03807680a36ff648aa11afafb7f481
Change-Id: Ia7d6ac8ffb03807680a36ff648aa11afafb7f481
2023-07-21 01:40:32 +00:00
Kelvin Zhang
753c1468e2 Handle zip64 extra fields better
Test: check_target_files_signatures
Bug: 283033491
(cherry picked from https://android-review.googlesource.com/q/commit:1e774245a4dd2763545827d65462e5c115eecb63)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e66c973a36339484e8fa59c37c9005badca62a5d)
Merged-In: I7da89f8389c09cc99201cff342483c158bd7e9c1
Change-Id: I7da89f8389c09cc99201cff342483c158bd7e9c1
2023-07-21 01:40:25 +00:00
Kelvin Zhang
9021cb5ae1 Fix python3.11's support for zip64
Bug: 283033491
Test: check_target_files_signatures -v -l
(cherry picked from https://android-review.googlesource.com/q/commit:38d0c373ac9e0f00c6e677c41bbc85f0e364ba02)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3c739f18475a9d31be299f3016dddc6a5ac02e16)
Merged-In: I9c1a5346e3a5f3920242dc9a5268d999f50a4937
Change-Id: I9c1a5346e3a5f3920242dc9a5268d999f50a4937
2023-07-21 01:40:18 +00:00
Kelvin Zhang
512a1f5f2d Use python based unzip function for portability
Bug: 283033491
Test: th
(cherry picked from https://android-review.googlesource.com/q/commit:7c9205b008002c41880241e866ad4b5438112439)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0bf992ee0595727b4a2c563fd5023287727dd8b3)
Merged-In: Ief86b55c1d4a14220a0fb593c583a721d59cf86c
Change-Id: Ief86b55c1d4a14220a0fb593c583a721d59cf86c
2023-07-21 01:40:12 +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
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
Yi Kong
bb31ca1168 Remove dangling reference to LLVMgold.so
We removed LLVMgold.so from the Android LLVM for a long time.

Change-Id: I334d93659f801cc3bcfff1162adc950c83ed14ba
Test: presubmit
2023-07-20 13:26:15 +00:00
Treehugger Robot
b34658e2cb Merge changes from topic "aconfig-improve-dump-formats" into main am: 08cb169cbe
Original change: https://android-review.googlesource.com/c/platform/build/+/2666957

Change-Id: I161e7f7f00f0df4666e425ceef47643463322b65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 13:11:32 +00:00
Treehugger Robot
5c2a6b4c79 Merge "aconfig: fix broken auto-generated Rust code" into main am: 9726e805b3
Original change: https://android-review.googlesource.com/c/platform/build/+/2664937

Change-Id: I36e0e6a0fc387105d6e278b3ab123b2787934e33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 13:10:59 +00:00
Treehugger Robot
08cb169cbe Merge changes from topic "aconfig-improve-dump-formats" into main
* changes:
  aconfig: add 'verbose' dump format
  aconfig: improve the 'text' dump format
  aconfig: remove the 'debug' dump format
2023-07-20 12:35:57 +00:00
Treehugger Robot
9726e805b3 Merge "aconfig: fix broken auto-generated Rust code" into main 2023-07-20 12:32:57 +00:00
Mårten Kongstad
2d5309cab1 aconfig: fix broken auto-generated Rust code
Fix syntax error in auto-generated Rust code that prevents the code from
compiling.

For reference, the error was:

---- 8< ----
error: expected `where`, `{`, `(`, or `;` after struct name, found keyword `impl`
 --> .../src/lib.rs:6:1
  |
6 | impl FlagProvider {
  | ^^^^ expected `where`, `{`, `(`, or `;` after struct name
---- >8 ----

Bug: 292052163
Test: manual: create sample based on auto-generated Rust lib
Change-Id: I4c029c0ee16ea3849e7bbe381717a10402c9cb81
2023-07-20 11:33:19 +02:00
Mårten Kongstad
ea4981407b aconfig: add 'verbose' dump format
Add a new --format=verbose dump output format. This is identical to the
default 'text' format but includes the source files from which the flag
declaration and values were read, and is intended to help debug why a
flag isn't set to some expected value.

Bug: 283910447
Test: atest aconfig.test
Test: printflags --format=verbose # manually inspect output
Change-Id: I03a1c8d940e7a0c6f91e986c5bafa4aa6cd1125a
2023-07-20 11:07:35 +02:00
Mårten Kongstad
3fa2f078ff aconfig: improve the 'text' dump format
Standardize the flag values as '<permission> + <state>', e.g.
'READ_ONLY + ENABLED'.

Bug: 283910447
Test: atest aconfig.test
Test: printflags # manually inspect output
Change-Id: I60f74196816327613bd8165a688f8b36da5bdac7
2023-07-20 09:35:05 +02:00
Mårten Kongstad
dbdc5d2265 Merge "Aconfig: sort the parsed flag order in create-cache" into main am: 9c3502d4b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2665656

Change-Id: I2a2265965232caf189eb3b4a2efb0db4258598ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 07:26:15 +00:00
Mårten Kongstad
9338007cff aconfig: remove the 'debug' dump format
The --format=debug dump output format is largely superseded by the
textproto format now that aconfig doesn't use hand-written wrappers
around the auto-generated proto struct anymore. Remove the format to
reduce the risk of code rot.

Bug: 283910447
Test: atest aconfig.test
Change-Id: I6700fc4eafd3fa3a63952109c0105d34c7ffd98b
2023-07-20 09:25:56 +02:00
Mårten Kongstad
9c3502d4b4 Merge "Aconfig: sort the parsed flag order in create-cache" into main 2023-07-20 06:35:02 +00:00