Commit Graph

67935 Commits

Author SHA1 Message Date
Yo Chiang f19a789d5b Merge "Refactor vendor_boot v4 build logic and add more checks" am: bebc8a35ef
Original change: https://android-review.googlesource.com/c/platform/build/+/1664081

Change-Id: Ie18ddffd7ba64b8dbe0b79689fa9ce67d75939fb
2021-04-06 09:37:41 +00:00
Yo Chiang bebc8a35ef Merge "Refactor vendor_boot v4 build logic and add more checks" 2021-04-06 09:02:14 +00:00
Yo Chiang fb51a1d107 Merge "Fix Makefile formatting" am: b5bff9a4d3 am: a7a67e0358
Original change: https://android-review.googlesource.com/c/platform/build/+/1664080

Change-Id: I71ca8cc9afae84378ac46e99eb8bf4f255b1bea2
2021-04-06 08:31:48 +00:00
Bowgo Tsai 1ed0fd54dc Builds boot-test-harness.img, if INSTALLED_BOOTIMAGE_TARGET.
Similar to commit Ic887ea93d4c5181eca0f82c3cdf3ce3b72f4c185
for boot-debug.img, we should also only build boot-test-harness.img
if boot.img exists.

Bug: 184365242
Test: tree hugger

Change-Id: Ie0d9e460905d488e418cf4ee1bd44e6e7c58470d
2021-04-06 08:20:15 +00:00
Yo Chiang a7a67e0358 Merge "Fix Makefile formatting" am: b5bff9a4d3
Original change: https://android-review.googlesource.com/c/platform/build/+/1664080

Change-Id: Idcc4ea15ac18e0fc7646fefa7579fd08c3b78729
2021-04-06 07:50:10 +00:00
Justin Yun 07ceaa71c1 Use BOARD_API_LEVEL to define ro.board.api_level
GRF devices must define the API level of which the SoC is first
shipped by setting BOARD_SHIPPING_API_LEVEL. As this is a permanent
value, vendors may not change this value even if they implement new
features under the GRF policy.

BOARD_API_LEVEL can be optionally defined in this case to manually
set the api level of the vendor implementation.
The current api level will be set to `ro.board.api_level` property.

Bug: 176950752
Test: atest --host post_process_props_unittest
Change-Id: Ib126c1a622ded9848650f3f60c0f15005867272d
2021-04-06 16:33:07 +09:00
Yo Chiang b5bff9a4d3 Merge "Fix Makefile formatting" 2021-04-06 07:27:44 +00:00
Treehugger Robot 75257bca9c Merge "Fix builds with enforce_vintf_kernel + !kernel" am: 3c610dd0aa am: 8163f0b665
Original change: https://android-review.googlesource.com/c/platform/build/+/1663197

Change-Id: I63c23ed361bb357f153f5e3d5667b932a992ef35
2021-04-06 04:19:45 +00:00
Treehugger Robot 8163f0b665 Merge "Fix builds with enforce_vintf_kernel + !kernel" am: 3c610dd0aa
Original change: https://android-review.googlesource.com/c/platform/build/+/1663197

Change-Id: I9aa24f9802bd16c39adedc15a760db25a2f6985e
2021-04-06 03:37:50 +00:00
Treehugger Robot 3c610dd0aa Merge "Fix builds with enforce_vintf_kernel + !kernel" 2021-04-06 02:51:38 +00:00
Stephen Hines d49aa55cf1 Remove all unused, legacy FDO build rules
There are no current users of this feature. All remaining references are
legacy scripts that aren't actually in-use today.

https://source.corp.google.com/search?q=BUILD_FDO_INSTRUMENT%20-file:build%2F
https://source.corp.google.com/search?q=LOCAL_FDO&ct=os&sq=package:%5Eandroid$

Test: build
Change-Id: I86ff6531a0868fb8e30741f0d04de1739fba4586
2021-04-05 17:13:00 -07:00
Daniel Norman fff34be7d6 Merge "Revert "Generate care map after merging target_files"" am: 25444470db am: d32fe918bd
Original change: https://android-review.googlesource.com/c/platform/build/+/1663821

Change-Id: I2cba120d9b8d17a39306ae57f58be36d45378b33
2021-04-06 00:00:45 +00:00
Stephen Hines 39e9090e7e Remove legacy host shared library linking with gcov
Test: build
Change-Id: I5f701edcfa9021f75659b6be4790119e6baca51c
2021-04-05 16:29:57 -07:00
Daniel Norman d32fe918bd Merge "Revert "Generate care map after merging target_files"" am: 25444470db
Original change: https://android-review.googlesource.com/c/platform/build/+/1663821

Change-Id: If0dcae373100740cbae9e71dd9f0014752d11c19
2021-04-05 23:19:41 +00:00
Elliott Hughes f4800de454 zipalign: clarify the help for -p slightly.
Bug: http://b/141281419
Test: treehugger
Change-Id: If331ad0450433bfb8e585e3df3727dd09ef14c66
2021-04-05 16:02:16 -07:00
Daniel Norman 25444470db Merge "Revert "Generate care map after merging target_files"" 2021-04-05 22:43:07 +00:00
David Anderson 203057cb9b Relax inode usage estimate.
The current inode usage estimate applies a factor (1.04x) to account for
differences between the directory and file count and what mkfs.ext4
produces. Bump this to 1.06x to allow more leniency.

This increases bramble partition sizes by 32KB total.

Bug: 182365132
Test: manual test
Change-Id: I9ade82cb89422e31ae8c5df9fff31157e88278c5
2021-04-05 13:45:02 -07:00
Daniel Norman 2d7989a635 Revert "Generate care map after merging target_files"
This reverts commit c184fa1887.

Reason for revert: b/184541365

Change-Id: Icbcbb6deb92863f4a468b9fa54f18d824a6f0939
2021-04-05 17:40:47 +00:00
Treehugger Robot 72eed42550 Merge "Generate care map after merging target_files" am: f92961248b am: 79c96bf3a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1649488

Change-Id: I2b00b86b6730fefc2408bf0131ef6e752826f76b
2021-04-05 05:52:47 +00:00
Treehugger Robot 79c96bf3a9 Merge "Generate care map after merging target_files" am: f92961248b
Original change: https://android-review.googlesource.com/c/platform/build/+/1649488

Change-Id: Ifac4a30a9fcf69a58bbe75e04089de3974906e71
2021-04-05 05:24:01 +00:00
Yi-Yo Chiang 9c461365de Fix Makefile formatting
Add indent to if-block so my text editor stop complaining.

Test: Presubmit
Change-Id: Ie3f4dbd114d894453bf46a91b47d5d0450e5e1e7
2021-04-05 12:49:17 +08:00
Treehugger Robot f92961248b Merge "Generate care map after merging target_files" 2021-04-05 04:43:27 +00:00
Yi-Yo Chiang 1519d4351e Refactor vendor_boot v4 build logic and add more checks
Add more checks around BOARD_BOOT_HEADER_VERSION in board_config.mk.

Refactor generation logic of vendor_boot ramdisk fragments.
Consolidate initialization and validation check to its own section.
Adjust some variable names and initialization sequence so the follow-up
change can land more cleanly.
Rename variable name "dir" so that it don't collide with the Makefile
function "$(dir ...)".

Bug: 183395459
Test: Presubmit; Change should be no-op with respect to build artifacts.
Test: Modify BoardConfig of CF and m dist. Verify the vendor_boot.img
  with unpack_bootimg.
Change-Id: I8785c40dd9f87f3797a56ada93e65939d27d0e9b
2021-04-04 20:40:17 +08:00
Ryan Prichard 663b98bbab Stop linking against libatomic
The __atomic_* library functions are now part of the compiler-rt
builtins library:

https://android-review.googlesource.com/c/toolchain/llvm_android/+/1625025

Bug: http://b/153025717
Test: treehugger
Change-Id: Iebd5eaf17f8559696b6d6e2e0dd782f77b6bcab5
2021-04-02 21:05:48 -07:00
Treehugger Robot dd1ee0b78f Merge "Don't disable verity if VABC is disabled" am: d2170430fe am: d2025215c8
Original change: https://android-review.googlesource.com/c/platform/build/+/1649487

Change-Id: Id09168d09c29009b9756a8428e1e6ef26af97fdd
2021-04-03 01:35:32 +00:00
Treehugger Robot d2025215c8 Merge "Don't disable verity if VABC is disabled" am: d2170430fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1649487

Change-Id: Iab3104d4c61ff85cbe68388d0eb22fd9bcc860c3
2021-04-03 00:59:26 +00:00
Yifan Hong 3e061bd1c8 Fix builds with enforce_vintf_kernel + !kernel
If a build has PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS
set (which is set for P+ builds) but no kernel is built,
the original code emits a warning, but it won't be able
to build target files package because it depends on
kernel_configs.txt and kernel_version.txt without any rules.

Properly clear BUILT_KERNEL_CONFIGS_FILE and BUILT_KERNEL_VERSION_FILE
so that it won't be depended on in this case.

Bug: 184128489
Test: TH + forrest

Change-Id: I4b8fbd117f114555cf606e3c3b48eb564dbe786b
2021-04-02 16:19:01 -07:00
Treehugger Robot d2170430fe Merge "Don't disable verity if VABC is disabled" 2021-04-02 22:52:45 +00:00
Elliott Hughes a6600c241e Merge "Remove honggfuzz support." am: 4ac1818cde am: a526577693
Original change: https://android-review.googlesource.com/c/platform/build/+/1663184

Change-Id: Ia46e509718525427316575db53be1459cedc1949
2021-04-02 22:10:44 +00:00
Elliott Hughes a526577693 Merge "Remove honggfuzz support." am: 4ac1818cde
Original change: https://android-review.googlesource.com/c/platform/build/+/1663184

Change-Id: I798a91fbd2f67d2eeb28a0c39824406d1179429e
2021-04-02 21:28:20 +00:00
Elliott Hughes 4ac1818cde Merge "Remove honggfuzz support." 2021-04-02 20:47:05 +00:00
Alexander Smundak 64b0c66389 Merge "Address reviewer comments from the previous commits" am: 14e6f9c708 am: c4c9320095
Original change: https://android-review.googlesource.com/c/platform/build/+/1661158

Change-Id: I28df32e7f4aca03c32de9620eb7bab2fbcab49e8
2021-04-02 18:59:28 +00:00
Treehugger Robot 8f95f2354d Merge "Always use /bin/sh to run the command." am: 9e766acb09 am: 0188c32fb5
Original change: https://android-review.googlesource.com/c/platform/build/+/1662423

Change-Id: I34b5400ffa66579ac8269e65b0ec84b82ba357d5
2021-04-02 18:58:52 +00:00
Alexander Smundak c4c9320095 Merge "Address reviewer comments from the previous commits" am: 14e6f9c708
Original change: https://android-review.googlesource.com/c/platform/build/+/1661158

Change-Id: I08e5df6185e209b9b5b9093caaec223322211925
2021-04-02 18:21:46 +00:00
Treehugger Robot 0188c32fb5 Merge "Always use /bin/sh to run the command." am: 9e766acb09
Original change: https://android-review.googlesource.com/c/platform/build/+/1662423

Change-Id: I040645a94d981eb7e4aa383958691d742e78cb0d
2021-04-02 18:15:40 +00:00
Alexander Smundak 14e6f9c708 Merge "Address reviewer comments from the previous commits" 2021-04-02 18:07:47 +00:00
Elliott Hughes a445ef6cde Remove honggfuzz support.
Everyone's on libFuzzer now.

(The "fuzz" referred to in base_system.mk was removed in Android 11, but
this reference was left lying around.)

Bug: http://b/184301511
Test: treehugger
Change-Id: I6fe0f2c37e014647802279a656d2c6c9625b7a44
2021-04-02 10:24:48 -07:00
Treehugger Robot 9e766acb09 Merge "Always use /bin/sh to run the command." 2021-04-02 16:20:41 +00:00
Sasha Smundak 357e37c4d4 Address reviewer comments from the previous commits
Fixes: 170637441
Test: rbcrun build/make/tests/run.rbc
Change-Id: Ifc16fe02d96bc3a4c5562b74da8c1e7b393dc000
2021-04-01 23:07:06 -07:00
Ryan Prichard 6751ce0f7c Merge "Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: f56f074e06 am: 7249bad17a
Original change: https://android-review.googlesource.com/c/platform/build/+/1661419

Change-Id: Ibdde561361aa84675f99ed34eb65c1ef1d08a54a
2021-04-02 00:05:52 +00:00
Sasha Smundak 57bb5081d7 Always use /bin/sh to run the command.
SHELL environment variable cannot be relied on because the rbcrun
can be run as `env - rbcrun ...`

Fixes: 184278019
Test: build/soong/soong_ui.bash --make-mode USE_BAZEL=1 TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug droid dist platform_tests
Change-Id: Id8fc7fd1ae8f2e674028ba5ffb3616f87eea6bc4
2021-04-01 16:44:47 -07:00
Ryan Prichard 7249bad17a Merge "Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: f56f074e06
Original change: https://android-review.googlesource.com/c/platform/build/+/1661419

Change-Id: If794d2b4ab66efc581eed2e682cdb5256e462699
2021-04-01 23:19:44 +00:00
Ryan Prichard f56f074e06 Merge "Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" 2021-04-01 22:42:33 +00:00
Tianjie Xu 9c844b4a67 Merge "Fix error if ramdisk is minigzip compression" am: 98c8507215 am: 0d54748e89
Original change: https://android-review.googlesource.com/c/platform/build/+/1641843

Change-Id: I0e184b3e39394f39250058d94fe05c43610a3f1c
2021-04-01 21:34:24 +00:00
Kelvin Zhang c184fa1887 Generate care map after merging target_files
Test: th
Bug: 182296208
Change-Id: I12c0732961ec1c4d18f5cc4d136c98babba23d82
2021-04-01 17:04:12 -04:00
Kelvin Zhang 50dc1b88b7 Don't disable verity if VABC is disabled
Test: th
Change-Id: Icef5315047aa783219e1dcb6678adaa084626e52
2021-04-01 17:04:12 -04:00
Tianjie Xu 0d54748e89 Merge "Fix error if ramdisk is minigzip compression" am: 98c8507215
Original change: https://android-review.googlesource.com/c/platform/build/+/1641843

Change-Id: I7e375fc27c01da86301dfd9b3282995070e965a1
2021-04-01 20:54:21 +00:00
Tianjie Xu 98c8507215 Merge "Fix error if ramdisk is minigzip compression" 2021-04-01 20:15:35 +00:00
Bob Badour c807f02529 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: a9cdd08ce5 am: aa894a6744
Original change: https://android-review.googlesource.com/c/platform/build/+/1660553

Change-Id: I712e71f531ae891fb2442e67bc0c5f6d22010838
2021-04-01 16:23:58 +00:00
Bob Badour aa894a6744 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: a9cdd08ce5
Original change: https://android-review.googlesource.com/c/platform/build/+/1660553

Change-Id: I41dcc3b91102277604bedec5addf5808549b949c
2021-04-01 15:44:34 +00:00