Commit graph

1607 commits

Author SHA1 Message Date
Wei Li
936ae9add6 Remove unused make variable BUILDING_PVMFW_IMAGE
Test: CIs
Change-Id: I56d72c08c1fe5794f8c550651a2805109b70391f
2023-03-29 07:29:54 +00:00
Treehugger Robot
896e7c715e Merge "Remove vtsc host tool" 2023-03-21 02:14:34 +00:00
Treehugger Robot
6dcf429d8f Merge "[config] Boards can supply custom super image script" 2023-03-20 17:52:41 +00:00
Aidan Wolter
fbf53522cf [config] Boards can supply custom super image script
Some boards may need to customize the format of the super image. We will
now provide the variable BOARD_CUSTOM_BUILD_SUPER_IMAGE so that boards
can provide their own script for constructing the super image. This
mimics similar code in the same file for allowing boards to supply a
custom VBMeta (BOARD_CUSTOM_AVBTOOL) or boot image
(BOARD_CUSTOM_MKBOOTIMG).

Bug: None
Change-Id: I461caeb6dfb705fd5c671228fc35561ed403a1cb
2023-03-17 20:17:35 +00:00
Steven Moreland
d733e64b9f Remove vtsc host tool
We haven't used this in years.

Bug: N/A
Test: N/A
Change-Id: If79b05d75ca358b110c2e1723f1dd7f522e13f12
2023-03-17 18:10:31 +00:00
Wei Li
499333616c Generate SBOM of the target product in file sbom.spdx.json in product out directory.
Original aosp/2374663 was reverted, so this change cnotains the implementation but disabled by default and SBOM will not be built by default with "m dist".

The feature will be enabled later in small CLs after running tests successfully in forrest.

Test: m sbom
Test: m dist
Test: on aosp, lunch aosp_bluejay-userdebug && m dist
Bug: 266726655
Change-Id: I926d0f97f3a0330ef61d059f12ea660005d370e6
2023-03-14 15:14:06 -07:00
Jiakai Zhang
60c08f24a7 Revert "Don't disable dexpreopt for an unbundled build."
This reverts commit d5d8904e52.

Reason for revert: Maybe broke the build on git_stage-aosp-master on mainline_modules_x86_64-userdebug

Change-Id: Ia33a642abda127b43aa6e265deb43dca7ee04f34
2023-02-09 12:56:59 +00:00
Jiakai Zhang
d5d8904e52 Don't disable dexpreopt for an unbundled build.
Dexpreopt generates profiles that need to be installed in the APEX.
Soong will skip the dex2oat step after it generates the build rule for
profiles.

Bug: 241823638
Test: -
  1. Patch ag/20581649 PS2.
  2. banchan com.android.btservices x86_64 && m
  3. Check that "javalib/service-bluetooth.jar.prof" exists in the APEX.
Change-Id: I5cad1b0e1027935fd78e80ad7b07e039f7b8d432
2023-02-08 03:47:24 +08:00
Benjamin Peterson
099349bea8 Fix remote execution of r8 and d8 in make
1. The location of the r8.jar and d8.jar files was no longer correct.
2. $(JAVA) was not defined before rbe.mk was included.
3. $(JAVA) includes options, which much be stripped to be a rewrapper toolchain input.

Test: ran against an RBE cluster with RBE_D8_EXEC_STRATEGY=remote and RBE_R8_EXEC_STRATEGY=remote

Change-Id: Icf434f5c0fda687c70c75b01b0bfd63bcd8cc474
2023-01-19 18:17:08 +00:00
Steven Moreland
747f49cb39 note sepolicy split deprecation
There is a lot of policy cruft left around to support this. We
would like to simplify the number of supported options, so doing
this as an advanced notice.

Bug: 257176017
Test: build
Change-Id: I1c4350fb3a075118be62d75cc1351eb20e584749
2022-11-30 00:46:39 +00:00
Colin Cross
15b02bd17d Merge "Add basic musl support to make" 2022-11-15 01:39:37 +00:00
Steven Moreland
4db1ffa24a clearer VNDK deprecation warning
Bug: 122954981
Change-Id: If629256f1c1b13d3d11c50fe77bfbab1f316dd7a
Test: N/A
2022-11-12 01:39:55 +00:00
Colin Cross
af7ac3986e Add basic musl support to make
There are still devices that set BUILD_BROKEN_USES_BUILD_HOST_* and
build host modules in Make.  Add basic support for building against
libc_musl in Make when USE_HOST_MUSL is set.

Bug: 258535366
Test: build a host tool defined in Android.mk file in internal branch
Change-Id: I9150be749bbeaac2ac5a33b2cf915004aa3033df
2022-11-09 16:40:25 -08:00
Spandan Das
03b846ff37 Merge "Migrate check_elf_file.py to python3" 2022-10-27 16:46:18 +00:00
Spandan Das
60b8195c83 Migrate check_elf_file.py to python3
Also, create a python_binary_host so that it runs using the hermetic
python toolchain.

Test: m check-elf-files
Bug: 203436762
Change-Id: I964342a27f6b6c9dcdbbe910d4dc6c9ec00c2213
2022-10-27 02:08:23 +00:00
Yi-yo Chiang
05c0807f2f Reland "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"
This reverts commit d6e2c8f84d.

Reason for revert: downstream branches are fixed

Change-Id: I55fa6e8db37d0b7d040679f54be238b512437d29
2022-10-25 17:46:10 +00:00
Yan Han
d6e2c8f84d Revert "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"
This reverts commit 2bd45d0fd8.

Reason for revert: b/255298902

Change-Id: If0b006b0d88dd08ff116abc50d7b9dd4c8ea5806
2022-10-24 12:58:31 +00:00
Yi-Yo Chiang
2bd45d0fd8 Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var
Bug: 241346584
Test: Presubmit build_test
Change-Id: I5fc9fd98dccd24ce31f493f63841ee049e7fc5b7
2022-10-18 09:39:23 +00:00
Yi-Yo Chiang
06c6273073 Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE
This variable is always false or empty now, so clean up remaining
references of the variable.

Remove "buildvariant=" kernel commandline as it was used by
system-as-root kernels to determine the system build variant. It is
unsupported now.

Bug: 241346584
Test: Presubmit
Change-Id: I0f97b6e0bf8b03429f65366119ff78f9c7983516
2022-10-13 16:08:53 +08:00
Yi-Yo Chiang
b4bd8395bf Assert BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true
Right now BOARD_BUILD_SYSTEM_ROOT_IMAGE is either empty or false.
This change stops new users from setting BOARD_BUILD_SYSTEM_ROOT_IMAGE
to true. After all remaining references (read or set to empty/false) to
BOARD_BUILD_SYSTEM_ROOT_IMAGE are removed, we can mark it as obsolete.

Bug: 241346584
Test: Presubmit build_test
Change-Id: Ie23504525ffc0f0dcad6dff81e7eddb22edffd0e
2022-10-06 19:00:04 +08:00
Pierre-Clément Tosi
cb1d31c43b core: Drop support for BOARD_PREBUILT_PVMFWIMAGE
Remove the variable as it was only used when the prebuilt was
device-specific but pvmfw is now part of AOSP.

Bug: 237371962
Test: m $(realpath --relative-to=. $ANDROID_PRODUCT_OUT/pvmfw.img)
Change-Id: I5b4c1ffd563e3dccf22ee485cb12866355f5bfe0
2022-09-09 19:15:30 +01:00
Cole Faust
b000208877 Rename mkf2fsuserimg.sh and mksquashfsimage.sh
See other cl in this topic for more information.

Bug: 198619163
Test: Presubmits
Change-Id: Ib39e8513a303a12e8bb6464a114ec39aa087d58a
2022-09-05 18:34:56 -07:00
Steven Moreland
34570d33f4 Merge "BOARD_VNDK_VERSION always by default" 2022-08-17 18:43:37 +00:00
Hung-Wei Chen
a7dfb456a1 Merge changes Ifbcde7da,Icee659ff,I267da2d5
* changes:
  Remove verity.mk, verity_key, PRODUCT_VERITY_SIGNING_KEY
  Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference
  Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER
2022-08-17 03:09:20 +00:00
Treehugger Robot
78ca053052 Merge "Add mainline dev certificate dir to config" am: 22907b7777
Original change: https://android-review.googlesource.com/c/platform/build/+/2185338

Change-Id: I1cfbe21e29145e2e8e0d5d70db921147467b3684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 11:25:19 +00:00
Inseob Kim
7b4d76700d Add mainline dev certificate dir to config
Bug: 33691272
Test: build
Change-Id: Iea4d96ab9c58a1be6d25aff4c0cf91cfc097470e
2022-08-12 21:35:45 +09:00
hungweichen
e3ca398a1e Remove verity.mk, verity_key, PRODUCT_VERITY_SIGNING_KEY
verity.mk is used to set the related variable for VB 1.0 support, but
we already removed VB 1.0. This change removes the unused code. We also
remove and block PRODUCT_VERITY_SIGNING_KEY in this change.

Bug: 241044073
Test: atest under build/make
Change-Id: Ifbcde7da27a931ef3b9d746b1c5a279d88c0ec85
2022-08-11 08:12:58 +00:00
hungweichen
bf11e34897 Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference
PRODUCT_SUPPORTS_VERITY and PRODUCT_SUPPORTS_VERITY_FEC are going to be
deprecated since we removed VB 1.0 support. This change removes the
related references.

Bug: 241044073
Test: atest under build/make
Change-Id: Icee659ff0606cda1ab44e92372d86a394ddf1466
2022-08-11 08:12:58 +00:00
hungweichen
b2dd683421 Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER
These varaibles are going to be deprecated since we removed VB 1.0
support. This change removes the related references. boot.img can be
verified by a AVB 2.0 hash descriptor now.

Bug: 241044073
Test: atest under build/make
Change-Id: I267da2d591525ffc0cabf92791cf66a36ef8ff62
2022-08-11 08:12:58 +00:00
David Anderson
0d4df8b638 Merge "Remove dynamic partition allowlist check" am: 93ff78f3ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2175686

Change-Id: If3936f5194f08919701fa7f4aa78cc1d302cf192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 04:01:20 +00:00
Changho Shin
040af27bb7 Remove dynamic partition allowlist check
If OEM's custom partitions directly apply to AVB-enabled A/B AOSP-defined partitions, and if those AOSP partitions are configured to be dynamic, that custom partitions should be dynamic as same as the others to catch up with AOSP partitions' changes when product is updated through OTA.
Remove valid dynamic partitions' list since that is no more necessary.

Bug: 238968263
Change-Id: Ic69f4ba58304110932b70d325cbb61ca8a5afee0
2022-08-08 01:30:42 +00:00
Steven Moreland
46a6081c43 BOARD_VNDK_VERSION always by default
There is a lot of pending cleanup pending on always having
the VNDK enabled. For instance, when some devices always
build with the core variant, it is impossible to have code
excluded from the system variant, since vendor code on
non-VNDK devices wouldn't be able to build.

This CL merely disables the flag. When it lands, there is a
lot of cleanup that would follow.

Bug: 122954981
Test: ¯\_(ツ)_/¯ removing untested paths
Change-Id: Ia9380fe54729ce1ab37cf0f5e8512be45cd550c7
2022-08-04 16:37:57 +00:00
Treehugger Robot
4711c28af2 Merge "Obsolete BOARD_PLAT_*_SEPOLICY_DIR" am: 7e91201269 am: d810636ae4
Original change: https://android-review.googlesource.com/c/platform/build/+/2120476

Change-Id: Ia3d4308e3228754e261e41c89f4639b014a0de55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 02:35:03 +00:00
Dan Willemsen
b34c387441 Obsolete BOARD_PLAT_*_SEPOLICY_DIR
These were marked as deprecated in late 2020 [1]. Shortly later, there
was an attempt to obsolete them [2] for products shipping with API level
31 or greater, but that was reverted [3] because of internal users.

1: I58c64839cc513ae082cd3ee3c1e108843ea7439e
2: Ic4d1164be611836f6aa697fbf1cb1f1c73a3cd39
3: I7d3556aa0f06684b43f80f09e4c8194c6c44336c

Since these are causing warnings on every build, and there are no more
internal users, just obsolete them entirely. We don't need to rely on
the product shipping api level, since that does not guarantee
source-level compatibility -- and this is an easy fix even if people
have been ignoring the real warnings.

Bug: 235414673
Test: treehugger
Change-Id: If803a33efc38a970247919bf224c12b8c717f955
2022-06-09 09:36:52 -07:00
Colin Cross
67e5e7f150 Merge "Remove HOST_DALVIK_*" am: 544aedda27 am: 265c1cc9a3
Original change: https://android-review.googlesource.com/c/platform/build/+/2059991

Change-Id: I2ab5dfd7d579f9b141c4e6022f40034a1c6ccfaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 16:54:18 +00:00
Colin Cross
a9203e6d87 Remove HOST_DALVIK_*
There are no more BUILD_HOST_DALVIK_* modules, remove the host dalvik
support.  The equivalent support in Soong just copies the device dex
file to the host dalvik location.

Test: m checkbuild
Change-Id: I4bcf916518317b28d3217994b2fe9ee95d7f50d6
2022-05-11 08:17:45 -07:00
Treehugger Robot
c210b52f20 Merge "Add 33.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: 7a79a27356 am: 911a63c0ff
Original change: https://android-review.googlesource.com/c/platform/build/+/2082702

Change-Id: Ibbcbe94b158572c0ef5d626b11c91de372a3f40f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:23:52 +00:00
Inseob Kim
0b734ccd91 Add 33.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Test: m selinux_policy
Change-Id: I0efaf48ff96c6225183cdbf13904ef41c9f2389d
2022-05-02 14:19:51 +09:00
Colin Cross
bc28181e3d Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two" am: 845e23b0de am: b8999c3d88 am: 1e492a67d2
Original change: https://android-review.googlesource.com/c/platform/build/+/2065912

Change-Id: I47ac1a65c04c32666535e20c44f989921e013577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:21:19 +00:00
Colin Cross
85722b807a Put javac, d8 and r8 rules into RBE ninja pool, take two
I60f7859f3657fc1eff0daf0e0a1b0f9fe63551b6 attempted to put the javac,
d8 and r8 rules into the RBE ninja pool so they could run 500 jobs
in parallel, but rbe.mk is not parsed during the main build phase
and the pool continued to be unset.  Move the pool configuration
into config.mk.

Bug: 228603472
Test: manual
Change-Id: I56377244e1c496034576ba5988393d88c2c5b09f
2022-04-18 12:10:33 -07:00
Cole Faust
28afecfd45 Merge "Remove usages of long-form variables" am: b760b469c7 am: 85f941cf3a am: c091ee15fb
Original change: https://android-review.googlesource.com/c/platform/build/+/2064287

Change-Id: I2610a8c39679c34cb82cb4dbd679dadf5f797666
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:23:48 +00:00
Cole Faust
81f1e92ed8 Remove usages of long-form variables
The long-form variables (PRODUCTS.<makefile>.<variable>)
are used to get information about multiple products.
However, they've never really worked correctly, and so
importing multiple products is deprecated behavior.

Remove as many usages of the long-form variables and
multi-product imports as possible.

Bug: 228518445
Test: Manually
Change-Id: I0b67f16360ff8bdcdb39638de739440472bccf76
2022-04-13 15:49:56 -07:00
Yurii Zubrytskyi
97191b2095 platform/build/make - T is now 33
Bug: 225745567
Test: Build
Change-Id: If115998c2ef9ef58329faa937e11d673f5585aab
2022-04-12 12:47:25 -07:00
Treehugger Robot
7bc6d0e71d Merge "Put javac, d8 and r8 rules into RBE ninja pool" 2022-04-12 14:27:24 +00:00
Colin Cross
24575c46e3 Put javac, d8 and r8 rules into RBE ninja pool
javac, d8 and r8 rules for module defined in Android.mk files are
running remotely with RBE but are running in the local ninja pool,
restricting them to only running as many jobs in parallel as there
are local CPUs.  Set the ninja pool to let them run 500 jobs in
parallel.

Bug: 228603472
Test: m checkbuild
Change-Id: I60f7859f3657fc1eff0daf0e0a1b0f9fe63551b6
2022-04-08 10:56:57 -07:00
Colin Cross
ac7febc9c7 Revert "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries""
This reverts commit 59ecb9e016.

Reason for revert: symbols_map is fixed to ignore non-elf files

Bug: 218888599
Change-Id: I88654b2dba3dfb9ab2809b0555544277279f345d
2022-04-06 01:11:20 +00:00
Colin Cross
59ecb9e016 Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"
This reverts commit 3570b3ed86.

Reason for revert: b/228195288

Bug: 218888599
Change-Id: I17b38ca1b6f8940d682f2782515bfd5f8db1ce58
2022-04-05 17:47:27 +00:00
Colin Cross
3570b3ed86 Produce mappings of hashes to elf symbols and r8 dictionaries
Run the symbols_map tool on each unstripped binary and proguard
dictionary while copying it to produce a textproto that maps the
hash to the symbol/dictionary file location.  Combine the textprotos
into a mapping file when producing the zipped build artifacts.

Bug: 218888599
Test: m dist
Change-Id: I78997e2f3b631ed74213903cc8e72415b2d7eee0
2022-04-04 16:04:52 -07:00
Treehugger Robot
ddfa3ff19c Merge "Always turn on TARGET_BUILD_USE_PREBUILT_SDKS for unbundled build." 2022-03-30 11:06:46 +00:00
Jiakai Zhang
11f44e2802 Always turn on TARGET_BUILD_USE_PREBUILT_SDKS for unbundled build.
Before this change, TARGET_BUILD_USE_PREBUILT_SDKS was turned on only if
TARGET_BUILD_APPS or TARGET_BUILD_UNBUNDLED_IMAGE is set. After this
change, TARGET_BUILD_USE_PREBUILT_SDKS is always turned on if
TARGET_BUILD_UNBUNDLED is set.

We need this change because we need to build ART services on the thin
manifest, and ART's build script only sets TARGET_BUILD_UNBUNDLED.

Bug: 177273468
Test: (on aosp-master-art) . ./build/envsetup.sh && lunch arm_krait-eng && art/tools/buildbot-build.sh --target
Change-Id: I1b5f63043d518ac8306bd172ef8afd69ab3ae8e5
2022-03-29 16:11:12 +01:00