Commit Graph

37479 Commits

Author SHA1 Message Date
Nelson Li
ab9e6521c2 Change BOARD_USES_RECOVERY_AS_BOOT to a Boolean type
Set `BOARD_USES_RECOVERY_AS_BOOT` to a Boolean type and use the
`select` syntax in Android.bp.
This usage is more concise and easier to understand compared to
`soong_config_module_type`.

Bug: 347605145
Test: m init_vendor
Change-Id: I551b560688c9bd792e3b9cadcdfc01b4e0215823
2024-06-25 02:49:47 +00:00
Treehugger Robot
a95db664df Merge "Add macro to support prebuilt vendor_vboot.img" into main 2024-06-21 22:12:12 +00:00
Wei Li
b036322c61 Merge "Export metadata of make modules and installed files." into main 2024-06-21 20:01:18 +00:00
chunhui dai
97944c71dc Add macro to support prebuilt vendor_vboot.img
There are marcos support to link prebuilt images and generate AVB images
in "make"/"make dist" flow. Currently defined marcos only cover boot.img
/init_boot.img/vendor.img and so on, missing the vendor_boot.img.
Appending a marco for prebuilt vendor_boot.img to work like other
prebuilt images.

Test: manual
Build pass in "make" and "make dist" flow and boot up with AVB

Change-Id: I7b296f82e57e8f71a0757d872d35ac27a8d2ecbe
Signed-off-by: chunhui dai <chunhuid@amazon.com>
2024-06-21 17:01:27 +00:00
Cole Faust
79d04e4115 Merge "Add soong_config_set_bool" into main 2024-06-21 01:21:25 +00:00
Cole Faust
95ff089b84 Add soong_config_set_bool
To allow typing soong config variables as bools for using in soong
select expressions.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I39496cd2a3366689e3f232ba10353a7d56d8d1ed
2024-06-20 14:51:39 -07:00
Elliott Hughes
f08f9b2cf8 libandroid_support was removed years ago.
Change-Id: I5279b398d112920d707b98ad985f5ab5079984a7
2024-06-20 16:25:47 +00:00
Yihan Dong
7c1c245214 Add cts-api-map report targets
Test: m cts-api-html-api-map cts-api-xml-api-map
cts-system-api-xml-api-map cts-system-api-html-api-map
Bug: 328699028

Change-Id: Idadeb9a9819148071761a75d97d814610c35fd30
2024-06-20 06:43:25 +00:00
Pechetty Sravani
874da86de2 Merge "Revert "Consider non-shipping lunch targets to be future."" into main 2024-06-19 08:31:25 +00:00
Pechetty Sravani
b5b8777686 Revert "Consider non-shipping lunch targets to be future."
This reverts commit 27f601f5d9.

Reason for revert: Droidmonitor triggered revert due to build breakage in b/348090986. Will be verifying through ABTD before submission.

Change-Id: I55e0880741e543309a7b991d49e59e4fa1f62e53
2024-06-19 07:47:32 +00:00
Jakub Czapiga
9de3473305 Merge "Drop legacy vboot support." into main 2024-06-19 07:32:35 +00:00
Inseob Kim
44ae5fc281 Merge "Add build_prop soong module" into main 2024-06-19 03:26:37 +00:00
Treehugger Robot
0159e92532 Merge "Add license metadata declaration in packages/services/Car" into main 2024-06-19 00:13:56 +00:00
Wei Li
a5b70ba64a Export metadata of make modules and installed files.
Bug: 324465531
Test: CIs
Test: m make-metadata
Change-Id: Ie4971477db7e6c395c4721c7978c0ff9cbc655f2
2024-06-18 14:45:18 -07:00
Cole Faust
318fc99a13 Merge "Add PLATFORM_SEPOLICY_VERSION as a soong config variable" into main 2024-06-18 18:05:42 +00:00
Steven Moreland
ca5e5d6fd6 Merge "Consider non-shipping lunch targets to be future." into main 2024-06-18 17:40:24 +00:00
Jakub Czapiga
31f6e08fc9 Drop legacy vboot support.
Bug: 291329969
Bug: 347885843
Bug: 347899892
Test: m
Test: CIs
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5071b95a067c9392b7bfa4d95957307ff0ccdcc3)
Merged-In: I5f30f63553cc2670650897e259ba51baf8ced05d
Change-Id: I5f30f63553cc2670650897e259ba51baf8ced05d
2024-06-18 15:40:14 +00:00
Inseob Kim
b9df6c75da Merge "Add soong extra config file" into main 2024-06-18 03:57:41 +00:00
Inseob Kim
d98ff7cce3 Add build_prop soong module
build_prop is a soong module generating {partition}/build.prop. It's
ported from build/make/core/sysprop.mk and will replace sysprop.mk in
the future. Currently used only by Android.bp cuttlefish system image.

Bug: 322090587
Bug: 346214958
Test: compare system/build.prop and aosp_cf_x86_64_system-build.prop for
      eng / user / userdebug
Change-Id: Iadb793a049b7be15b36f948c3a473105db3835a1
2024-06-18 11:25:29 +09:00
Wei Li
efc2f7cd5d Merge "Add module type information to make modules." into main 2024-06-18 00:02:34 +00:00
Wei Li
a73c8bc224 Record binary modules' whole static library dependencies in make.
Bug: 324465531
Test: CIs
Change-Id: Icf2a664b11d29be18bbf3ab16286b7fc746b9ba6
2024-06-17 15:06:20 -07:00
Wei Li
0762f5f02a Add module type information to make modules.
To be paired with $(call record-module-type)

Bug: 324465531
Test: CIs
Change-Id: Ie1649093e299c43a2642fb9d27a0a56b1c8e40c1
2024-06-17 21:53:27 +00:00
Cole Faust
f4ad02f818 Add PLATFORM_SEPOLICY_VERSION as a soong config variable
So that it can be used in android.bp files. This is to replace the
existing usages of PLATFORM_SEPOLICY_COMPAT_VERSIONS.

Bug: 347605145
Bug: 342006386
Test: m nothing --no-skip-soong-tests
Change-Id: Ia2831fa2c77b2f55d4e39e48b71acf13c605bf1e
2024-06-17 12:38:41 -07:00
Inseob Kim
15961c8523 Add soong extra config file
Soong extra config file contains Makefile variables that Soong itself
doesn't need to know. It will be read by product_config module to
provide Makefile variables to build tools e.g. build.prop.

Bug: 346214955
Test: see output of product_config module
Change-Id: I045b2722ae85a10d33b9e6b832f4cc2d6789e59a
2024-06-17 10:18:14 +09:00
Treehugger Robot
33a0dc9153 Merge "Move clean-oat-host to build/core/tasks/art.mk" into main am: 98905f38c2
Original change: https://android-review.googlesource.com/c/platform/build/+/3127593

Change-Id: I185383a0ab40c123536adc5e382954d27d2c76e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 00:50:13 +00:00
Treehugger Robot
98905f38c2 Merge "Move clean-oat-host to build/core/tasks/art.mk" into main 2024-06-14 00:46:46 +00:00
Treehugger Robot
3694e76222 Merge "Require protobuf for build flags" into aosp-main-future 2024-06-13 20:05:39 +00:00
Treehugger Robot
f3aab9de59 Merge "Allow experimental use of Java 21 by default in makefiles" into main am: 0aeb964be8
Original change: https://android-review.googlesource.com/c/platform/build/+/3125236

Change-Id: I3591e94a4a92ec6a3f5b822ce44de20993d1614f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 19:19:32 +00:00
Treehugger Robot
0aeb964be8 Merge "Allow experimental use of Java 21 by default in makefiles" into main 2024-06-13 19:15:50 +00:00
LaMont Jones
e3e84fc1b7 Require protobuf for build flags
This change forces build flags from .scl to .textproto format.

Bug: 328495189
Bug: 338450506
Test: manual, TH
Merged-In: Ia33aae158d62c12666d97449cea0c02b60550a21
Change-Id: Ia33aae158d62c12666d97449cea0c02b60550a21
2024-06-13 10:54:21 -07:00
Treehugger Robot
03468748d3 Merge "Shift the preprocess mk before build emulator packages" into main am: 9566130852
Original change: https://android-review.googlesource.com/c/platform/build/+/3128074

Change-Id: Ia51da8f3a3da18ce26af01d6503c2c2dc6491792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 08:36:39 +00:00
Herbert Xue
9852b95ff3 Shift the preprocess mk before build emulator packages
Test run:
- https://android-build.corp.google.com/builds/abtd/run/L68900030004495469

Bug: 344588337
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk_g3caiman_x86_64 TARGET_RELEASE=trunk TARGET_BUILD_VARIANT=userdebug droid dist
Change-Id: I7d050428d5cc17de8078f8824991b71b7915a4a4
2024-06-13 14:36:13 +08:00
Treehugger Robot
c17b8e9aa6 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main am: f94c02c7f3
Original change: https://android-review.googlesource.com/c/platform/build/+/3127554

Change-Id: I3eb52390b1da643d2e28e373560bde96d35076e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 02:43:51 +00:00
Treehugger Robot
f94c02c7f3 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main 2024-06-13 02:34:51 +00:00
Nelson Li
4abfb5c09e Move clean-oat-host to build/core/tasks/art.mk
Since Soong genrules now run in sandboxed mode, they cannot execute
commands like `rm -rf` within `clean-oat-target` to remove physical
directories.

The only solution is to move the `clean-oat-target` commands into
`build/core/tasks`.

Bug: 345133095
Test: m clean-oat; m clean-oat-host
Change-Id: Ifce4d5dc4bdb8e3735784135cf6f2ff143e90fe9
2024-06-13 02:09:35 +00:00
Treehugger Robot
200880c0b7 Merge "Convert appcompat.sh to a Python binary" into main am: 3dcc84df5c
Original change: https://android-review.googlesource.com/c/platform/build/+/3106579

Change-Id: I5bdfde8f27751ae817596c1a1dbcb1411c31f3c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 01:06:05 +00:00
Treehugger Robot
3dcc84df5c Merge "Convert appcompat.sh to a Python binary" into main 2024-06-13 00:51:27 +00:00
Herbert Xue
5c71b1af0e Move license metadata declaration of bramble/Android.mk into meta-lic.mk
Bug: 346457924
Test: NA
Change-Id: Ie0fcb71bd3a10d54700256f3e19296a6aaac1298
2024-06-12 14:34:31 +08:00
Sorin Basca
73ba79702e Allow experimental use of Java 21 by default in makefiles
Bug: 342332820
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_21=true m javac-check lint-check dist
Change-Id: I510746d617c49a0423f1ab0171a3474b181c3875
2024-06-11 14:30:39 +01:00
Jim Tang
ee4f021f6e Add license metadata declaration in packages/services/Car
Bug: 343598504
Test: presubmit
Change-Id: I858d65c70fb9c3904f01c6ed29be156248a73467
2024-06-11 13:56:04 +08:00
Treehugger Robot
fc9567c25b Merge "Add license metadata declaration in device/generic/goldfish" into main am: a96b36bd9f
Original change: https://android-review.googlesource.com/c/platform/build/+/3113262

Change-Id: I27d42d389336a7fd2edb7f3b08a7f75a3c971f8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-08 02:24:47 +00:00
Treehugger Robot
a96b36bd9f Merge "Add license metadata declaration in device/generic/goldfish" into main 2024-06-08 02:07:02 +00:00
Treehugger Robot
812d3e988c Merge "Add support to disable adb root on userdebug builds based on product config" into main am: 878141b810
Original change: https://android-review.googlesource.com/c/platform/build/+/3118597

Change-Id: Idc6a114fa58a832dac67000489c97d00ae1a4975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-08 00:46:16 +00:00
Treehugger Robot
878141b810 Merge "Add support to disable adb root on userdebug builds based on product config" into main 2024-06-08 00:26:20 +00:00
Treehugger Robot
e48e393a12 Merge "Fix expansion of _include_stack in _import-node" into main am: 7120481a00
Original change: https://android-review.googlesource.com/c/platform/build/+/3119358

Change-Id: I8d0014c551d42be8cf3e81cd23e6b1378314dd12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 23:42:17 +00:00
Joe Onorato
d4b4224e02 Add support to disable adb root on userdebug builds based on product config
Test: manually verify
Bug: 345480978
Change-Id: I00cf7d30f66137055ed0aa495bf3d98143c391b7
2024-06-07 16:24:06 -07:00
Spandan Das
cc4e318dce Merge "Prevent implicit outputs created during dexpreopt_config.zip" into main am: d7c448f0f7
Original change: https://android-review.googlesource.com/c/platform/build/+/3117879

Change-Id: I5043fae20d7b533fe8fa4d1de1aa345c27c2a63f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 21:51:03 +00:00
Rashid Zaman
7a29da75fe Fix expansion of _include_stack in _import-node
During product configuration after a subgraph has been fully imported,
i.e. a makefile and all makefiles it inherits from have been imported,
the makefile representing the root node of this subgraph is meant to be
removed from _include_stack in the _import-node macro via the call to
the wordlist function. Instead, _include_stack is being cleared because
the last argument to the wordlist function is escaped so when it is
expanded before being passed to wordlist instead of expanding to the
value of _include_stack the reference to _include_stack is unescaped.
Fix this by removing the escaping of the variable reference.

This issue has no impact on product configuration but the correct value
of _include_stack helps when debugging product configuration because,
for example, the dumpconfig generated by 'product-config' contains the
value of _include_stack when nodes are imported.

Bug: 345709996
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug && \
  m nothing shows no change to build.ninja files
Test: Run product-config and dumpconfig.csv shows correct include
  stack, e.g. for telephony_product.mk

Change-Id: I5a9b22fffc147ceea3d49e298b1bbad45f71332c
Signed-off-by: Rashid Zaman <rashidz@meta.com>
2024-06-07 14:46:16 -07:00
Spandan Das
d7c448f0f7 Merge "Prevent implicit outputs created during dexpreopt_config.zip" into main 2024-06-07 21:28:44 +00:00
Spandan Das
d9d72c46ba Prevent implicit outputs created during dexpreopt_config.zip
$PRODUCT_OUT/dexpreopt_config.zip is created by zipping all the
dexpreopt configs of individual apps. These config files are created in
$PRODUCT_OUT/dexpreopt_config, and this dir is as used as -C for
soong_zip.

In the current implementation, this build action also implicitly copies
global configuration files dexpreopt.config and dexpreopt_soong.config
into $PRODUCT_OUT/dexpreopt_config with the intent of being included in
the resultant zip file. These implicit outputs are unknown to ninja.

This CL prevents creation of these implicit outputs.
out/soong/dexpreopt_soong.config and
out/soong/dexpreopt_<arch>/dexpreopt.config is now passed directly to
soong_zip via -f.

Bug: 333316620
Test: m out/target/product/vsoc_x86_64/dexpreopt_config.zip # no longer
bit identical since the relative order changes, dexpreopt(_soong).config
now appears at the bottom of the zip
Test: zipcmp dexpreopt_config.zip.before dexpreopt_config.zip.after # no
diffs

Change-Id: Ib30c9a5c436e263231f9688129ab94664277b841
2024-06-07 17:45:19 +00:00