Commit Graph

92890 Commits

Author SHA1 Message Date
Colin Cross
6befb342fd Support aconfig dump --dedup
Add a flag to aconfig dump that will allow identical flags to be merged
without erroring.  This will allow merging the aconfig cache files from
dependencies for each module, which requires passing less data to Make
from Soong, and thus reduces the percentage of builds require Kati
analysis.

Bug: 313698230
Test: aconfig.test
Change-Id: Id2d9b78225720ce01defad4b13ea9395f6ab1033
2023-11-29 12:04:36 -08:00
Ted Bauer
5169faa366 Merge "aconfig: Add exported mode to aconfig Java library generation." into main am: df2b347f9f
Original change: https://android-review.googlesource.com/c/platform/build/+/2848173

Change-Id: I7a2ab31139f9a29dc4cc415207f7e37ad2802c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 18:59:21 +00:00
Ted Bauer
df2b347f9f Merge "aconfig: Add exported mode to aconfig Java library generation." into main 2023-11-29 18:23:10 +00:00
Colin Cross
7bf03bf68e Fix test data to use my_test_data_file_pairs
The format of LOCAL_TEST_DATA when provided by Soong can included a
third colon-separated field with an extra relative path that is not
being handled when assigning to ALL_MODULES.$(my_register_name).TEST_DATA.
Use my_test_data_file_pairs instead, which has already been transformed
to a src:dest pair.

Bug: 311428265
Test: examine module-info.json
Change-Id: I3a089cc24ea1492f1f7cf891c73ee7b43f273bb3
2023-11-29 10:18:52 -08:00
Colin Cross
4ea5e85143 Simplify module-info.json by leaving out optional fields
Every field in module-info.json has at least "[]".  Add functions to
only write the values when they are non-empty to reduce the size
and ease comparison when module-info.json is written by Soong.

Bug: 309006256
Test: atest --host toybox-gtests --test-timeout=120000
Change-Id: I200e8c8fd9727b4cffa9b82318f4433fd630e933
2023-11-29 10:18:52 -08:00
Colin Cross
2062646c87 Don't install test data from Soong
Soong has already created the test data installation rules.  Make still
handles packaging the test data into test suites.

Bug: 311428265
Test: atest --host toybox-gtests --test-timeout=120000
Change-Id: Ida0469e600b1dec4ce4e450a6c517ae13c133ded
2023-11-29 10:18:52 -08:00
Colin Cross
3a2ff8e27e Use files written by Soong
Soong now writes transitive resource packages and combined proguard
flags files to files instead of passing them as a list to Make, so
Make no longer needs to write them to files.

Bug: 309006256
Test: m checkbuild
Change-Id: I3ff78047f417f8578063f9c7a97ef4c65ba33af3
2023-11-29 10:18:52 -08:00
Ted Bauer
4a6af78b69 aconfig: Add exported mode to aconfig Java library generation.
This commit adds a third codegen mode, _exported_, in addition to
the existing modes, production and test.

When codegen mode is _exported_, getters are generated _only_ for
flags marked as exported as well. Also the getters always look
up DeviceConfig values at runtime, and have a default value of
false.

This only implements exported mode for Java codegen, follow-up CLs
will support Rust and C++.

Test: atest aconfig.test
Bug: 311152507
Change-Id: Ie39379b40de072180e05d84c76361b24cc0e0d83
2023-11-29 15:44:24 +00:00
Jiakai Zhang
e1dd0563b3 Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main am: 1f61e734d6
Original change: https://android-review.googlesource.com/c/platform/build/+/2847398

Change-Id: Ib519b83b3700a4014d5b5d9d868dc73c9cb5219c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 10:50:42 +00:00
Jiakai Zhang
1f61e734d6 Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main
* changes:
  Remove PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK.
  Set `dalvik.vm.disable-art-service-dexopt=true` on eng build.
2023-11-29 10:17:29 +00:00
Dennis Song
60046f4d0a Merge "Expose --avb_resolve_rollback_index_location_conflict" into main am: 4605c0ec76
Original change: https://android-review.googlesource.com/c/platform/build/+/2851825

Change-Id: Iafc38e02462eddc8166837901c70850add99c700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 09:25:19 +00:00
Dennis Song
4605c0ec76 Merge "Expose --avb_resolve_rollback_index_location_conflict" into main 2023-11-29 08:54:36 +00:00
Yi-Yo Chiang
21549ed608 Merge "releasetools: Deprecate GKI build rules" into main am: 6312ff59c1
Original change: https://android-review.googlesource.com/c/platform/build/+/2846154

Change-Id: I9311962f1f61e045b1c31d9eb0f843a9e384e95e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 07:53:00 +00:00
Yi-Yo Chiang
6312ff59c1 Merge "releasetools: Deprecate GKI build rules" into main 2023-11-29 06:47:25 +00:00
Dennis Song
79e313972c Expose --avb_resolve_rollback_index_location_conflict
Expose this option at `merge_builds.py` so that this script
can also resolve the conflict AVB rollback index location
while building the vbmeta image.

Bug: 289368551
Test: TreeHugger
Change-Id: I404160ff5d7591cb6a81ed2d2267de1b0e6ac65f
2023-11-29 06:03:44 +00:00
Yi-Yo Chiang
3637989aa1 Merge "Deprecate BOARD_GKI_SIGNING_* vars and build rules" into main am: 3afaac28b9
Original change: https://android-review.googlesource.com/c/platform/build/+/2846155

Change-Id: I67902ab748b64c7bc23eb9c3c1032d3c606f34b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 03:41:59 +00:00
Yi-Yo Chiang
3afaac28b9 Merge "Deprecate BOARD_GKI_SIGNING_* vars and build rules" into main 2023-11-29 03:04:59 +00:00
Jooyung Han
eeb92a131f Merge "Remove APEX from merged target-files package" into main am: 2ee7f71e62
Original change: https://android-review.googlesource.com/c/platform/build/+/2845736

Change-Id: Id16909d68f2ca01cbd0093fbbdc438bcf38f605d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 03:01:37 +00:00
Jooyung Han
2ee7f71e62 Merge "Remove APEX from merged target-files package" into main 2023-11-29 02:09:32 +00:00
Po Hu
ce867a65b5 Remove APEX from merged target-files package
It was a temp folder created for check_target_files_vintf.py.
But now it is wrongly archived by create_target_files_archive
in merge_target_files.py.
And then such package will cause CheckVintf exception in
ota_from_target_files.py because the APEX folder is created
again but already exists.
So use MakeTempDir to make it removed after check finished.

Test: merge_target_files & ota_from_target_files
Change-Id: Iab54afff2c346a582d5ee5228103fe091e016cd0
2023-11-29 08:54:44 +08:00
Colin Cross
af7c3ce438 Merge "Don't store notice files for Soong modules" into main am: 00a0933af0
Original change: https://android-review.googlesource.com/c/platform/build/+/2842095

Change-Id: I6ddcd84e01ced0ad193157706f98be06d0640d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28 23:07:28 +00:00
Colin Cross
00a0933af0 Merge "Don't store notice files for Soong modules" into main 2023-11-28 22:51:32 +00:00
Kelvin Zhang
b84d2aa7d1 Sign OTA packages inside target_files during signing
Test: th
Bug: 293313353
Change-Id: Ifd5dd08153c5970dac8166808173f7dfbbb3411d
2023-11-28 10:08:38 -08:00
Jiakai Zhang
364e9c39de Remove PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK.
This was added by r.android.com/513843 to force dexpreopt some GMS core
modules even if dexpreopt is disabled, to avoid some memory usage
regression. We no longer need it because dexpreopt is never disabled on
production builds.

Bug: 313505540
Test: m
Change-Id: Iff7f1d340a3ecd64cdc3d2f83f9c37c109a81fda
2023-11-28 13:46:13 +00:00
Jiakai Zhang
8737d4baf5 Set dalvik.vm.disable-art-service-dexopt=true on eng build.
We can't set all the `pm.dexopt.*` properties to `skip` because there
are product configs that have set those properties and therefore
conflict with our settings.

Bug: 313505540
Test: (on internal main) -
  1. `lunch` an eng build of an internal Go device.
  2. m
Change-Id: Ia3306d0c5d721e84b5cd5ab019302bb644f6de72
2023-11-28 13:43:52 +00:00
Yi-Yo Chiang
faaede0f01 releasetools: Deprecate GKI build rules
We no longer build GKIs from the platform tree.
These build commands were neither used nor maintained anymore, so clean
them up to reduce maintenance effort.

Bug: 229701033
Fix: 229701033
Test: presubmit
Change-Id: Ie882fccd864920289e48366e99a4ebd67e784d0d
2023-11-28 08:54:33 +00:00
Timothy Yiu
01d0904f8d Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main am: 970bf093cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2806341

Change-Id: I4d65df474d4d3b567e2d30e0acb50ab91941c9e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28 06:21:04 +00:00
Timothy Yiu
970bf093cd Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main 2023-11-28 05:41:32 +00:00
Daniel Rosenberg
d9a520c5bd Add support for different F2FS block sizes
F2FS has been expanded to allow for different block sizes. Currently the
block size must be the same as page size, but this may change in the
future. This gives support for 16K while not restricting the ability to
choose a block size that isn't based on the page size later on.

Bug: 279820706
Test: Boot 16k F2FS device
Change-Id: I4e025d83a5e5ad03d89bc80b02fea390c2cbad69
2023-11-27 18:09:18 -08:00
Yi-Yo Chiang
d6f568f587 Deprecate BOARD_GKI_SIGNING_* vars and build rules
These were for building and signing GKIs in the platform tree.
We are no longer building GKIs this way, so remove these dead build
rules.

Bug: 229701033
Test: presubmit
Change-Id: I0b807de1407988489e994ec5a0da282616ac1af1
2023-11-28 09:31:47 +08:00
Yi-Yo Chiang
0687b5d4ef Merge "Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" into main am: 5366754f62
Original change: https://android-review.googlesource.com/c/platform/build/+/2846153

Change-Id: I66f4b59416951a75b1f2283ea5b1f49df8a2bddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28 01:03:00 +00:00
Yi-Yo Chiang
5366754f62 Merge "Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" into main 2023-11-28 00:38:44 +00:00
LaMont Jones
b7d5e876a9 Merge "Allow overrides in declare-release-config" into main am: 35f4053425
Original change: https://android-review.googlesource.com/c/platform/build/+/2847697

Change-Id: I4c43ad23360c1d1d5a1c1a123844bbf10c5e43e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27 23:46:50 +00:00
LaMont Jones
35f4053425 Merge "Allow overrides in declare-release-config" into main 2023-11-27 23:08:02 +00:00
LaMont Jones
a6b6e67e3b Allow overrides in declare-release-config
A release config declaration may indiciate that one or more other
release configs should be applied before this one overrides them, so
that we don't have to manually keep common flags in sync.

Bug: b/313479515
Test: manual
Merged-In: Ib7350500ae44adf4767aa7f9dbb8e71609fdd8c0
Merged-In: Ida444a5dbba578a36bd3607246fa14fc73b3f923
Change-Id: Ida444a5dbba578a36bd3607246fa14fc73b3f923
2023-11-27 22:02:56 +00:00
tyiu
bbaa5efbbc Add config for FULL_SYSTEM_OPTIMIZE_JAVA
FULL_SYSTEM_OPTIMIZE_JAVA allows device to enable full system java
optimization.

Bug: 300514883
Test: local m
Change-Id: Iba0a546ef2b721b929b791c6a9e6c854e9bec909
Merged-In: Iba0a546ef2b721b929b791c6a9e6c854e9bec909
2023-11-27 19:29:31 +00:00
Yi-Yo Chiang
f061800468 Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK
These variables are no longer used. We don't build GKI in the platform
tree anymore. Remove these vars as we are not maintaining these.

Bug: 229701033
Test: presubmit
Change-Id: If8c978a07094da6a651c1e3f06a437dea9ef52b9
2023-11-24 15:04:33 +08:00
Treehugger Robot
fe8ac5cbd3 Merge "Define ro.llndk.api_level" into main am: 53084d3f91
Original change: https://android-review.googlesource.com/c/platform/build/+/2839957

Change-Id: Iecfadecba48e81da7214c6190f21fd3d59441881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-23 22:43:00 +00:00
Treehugger Robot
53084d3f91 Merge "Define ro.llndk.api_level" into main 2023-11-23 22:15:28 +00:00
Mark White
50b5bcbb48 Merge "Suggest developers use -eng builds instead when they lunch -userdebug" into main am: 9075d32212
Original change: https://android-review.googlesource.com/c/platform/build/+/2803914

Change-Id: I66fd1524d81afcb4319633163a52f7c2b7e121f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-23 17:31:55 +00:00
Mark White
9075d32212 Merge "Suggest developers use -eng builds instead when they lunch -userdebug" into main 2023-11-23 16:18:35 +00:00
Oriol Prieto Gascó
ddff40facb Merge "Add is_exported field to aconfig.proto" into main am: c96bf2caec
Original change: https://android-review.googlesource.com/c/platform/build/+/2838715

Change-Id: I8a393e11e624798ce757818fb17709fc36ef86d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 13:57:31 +00:00
Oriol Prieto Gascó
c96bf2caec Merge "Add is_exported field to aconfig.proto" into main 2023-11-22 13:41:09 +00:00
Justin Yun
f2b6016e53 Define ro.llndk.api_level
If RELEASE_BOARD_API_LEVEL is defined, set the API level to
ro.llndk.api_level to show the maximum api level that the LLNDK in
the system partition supports.

Bug: 312098788
Test: getprop ro.llndk.api_level
Change-Id: Ia65bf6c30ea19b229543d35df788eb202fd50dd4
2023-11-22 20:08:49 +09:00
Treehugger Robot
1ac2219abb Merge "Add CHECK_DEV_TYPE_VIOLATIONS" into main am: f37973cc12
Original change: https://android-review.googlesource.com/c/platform/build/+/2839616

Change-Id: I81a7f4a1c703a69d0a837c9466067de87c2e131f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 05:23:22 +00:00
Treehugger Robot
f37973cc12 Merge "Add CHECK_DEV_TYPE_VIOLATIONS" into main 2023-11-22 04:36:58 +00:00
Colin Cross
acd61f926f Don't store notice files for Soong modules
Soong modules have already generated their license metadata file, the
stored notice file list is not used.

Bug: 309006256
Test: no change to out/build-cf_x86_64_phone.ninja
Change-Id: I69ab4e3023db7ed42363e4a8eedbd737f237e509
2023-11-21 15:42:15 -08:00
Wonsik Kim
90f1cbbef4 Merge "aconfig: move cache_ as a memeber" into main am: 8a64367cb5
Original change: https://android-review.googlesource.com/c/platform/build/+/2835795

Change-Id: I221740ec17676eb6c55db020f5b16fd132d7d9d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 18:24:41 +00:00
Wonsik Kim
8a64367cb5 Merge "aconfig: move cache_ as a memeber" into main 2023-11-21 17:57:39 +00:00
Aditya Choudhary
2a4fb8417e Merge "Split filepaths on ' ' in metadata generator" into main am: c35ca4de22
Original change: https://android-review.googlesource.com/c/platform/build/+/2840735

Change-Id: I30cfb9d7a022c63a7dffd369439b0a47d6c7f83e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 16:43:36 +00:00