Commit Graph

67777 Commits

Author SHA1 Message Date
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
6c7e02e74e Support installing modules.options file
Usage:
```
BOARD_(VENDOR|VENDOR_RAMDISK)_KERNEL_MODULES_OPTIONS_FILE(_ver) := \
  $(wildcard <path of modules.options in source tree>)
```

Then the modules.options would be installed as
(vendor_dlkm|vendor_ramdisk)/lib/modules/(ver/)modules.options.

Also fix bug where the kernel version subdir is missing when generating
modules.blocklists file.

Bug: 182417593
Bug: 184238876
Test: Create a options file with incorrect syntax, verify build fails
Test: Verify the new macro indeed installs the options file
Change-Id: I7ba56e9dd8d73055bc276446c385a8d79080c2a6
2021-04-04 14:25:47 +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
Yo Chiang
d8db785ed0 Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""
This reverts commit 1178673d5e.

Reason for revert: reland after aosp/1663197 is submitted

Change-Id: I3e03e62af38f329e24c057748d1e90a09a38a3b8
2021-04-03 14:56:51 +00: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
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
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
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
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
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
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
Bob Badour
a9cdd08ce5 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" 2021-04-01 15:18:49 +00:00
Treehugger Robot
f1350276c7 Merge "Adding bootimage_test_harness artifact to droidcore" am: 8a42f673ac
Original change: https://android-review.googlesource.com/c/platform/build/+/1659677

Change-Id: I9343ea0fc25317931f0bdb5ef34648eb0b857f9d
2021-04-01 14:24:35 +00:00
Treehugger Robot
8a42f673ac Merge "Adding bootimage_test_harness artifact to droidcore" 2021-04-01 13:51:50 +00:00
Ulyana Trafimovich
41a2ed7460 Merge "Add documentation for <uses-library> checks." am: c6baae04c0
Original change: https://android-review.googlesource.com/c/platform/build/+/1658103

Change-Id: I21712e5197b3cb06e82e476f4c2f7277142034e9
2021-04-01 10:49:07 +00:00
Ulyana Trafimovich
c6baae04c0 Merge "Add documentation for <uses-library> checks." 2021-04-01 09:54:43 +00:00
Bob Badour
bfa8d0cacc [LSC] Add LOCAL_LICENSE_KINDS to build/make
Added SPDX-license-identifier-Apache-2.0 to:
  tools/rbcrun/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I6a1c75458115b15d9d0d9f0dbc11e0acffc1fe7b
2021-03-31 19:57:06 -07:00
jiajia tang
f3f842b676 Fix error if ramdisk is minigzip compression
This change intends to fix if ramdisk is not "lz4" compression.
Legacy is "minigzip" compression.

If not lz4, the following error will happen when exec build_super_image.py:
  Unable to get boot image build props: Failed to run command '['lz4', '-d', '/tmp/boot_omdZZ8.img/ramdisk', '/tmp/boot_omdZZ8.img/uncompressed_ramdisk']' (exit code 44):
  Error 44 : Unrecognized header : file cannot be decoded

Change-Id: I71248387bbeecbf184e0c24e6346c235d728518e
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
2021-04-01 10:41:00 +08:00
Ryan Prichard
6d74870a67 Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"
This reverts commit 9cd4aff304.

Bug: http://b/153025717
Test: treehugger
Change-Id: I548ca3dd5bdddb52199b4b5e1455832ee1d28125
2021-03-31 15:33:35 -07:00
Alexander Smundak
a0b657ef80 Merge changes from topic "product_config_star" am: fe5799af6b
Original change: https://android-review.googlesource.com/c/platform/build/+/1486492

Change-Id: Ia0f8f086e4841635bc02769a5cd134d771a1f7e2
2021-03-31 19:54:52 +00:00
Sasha Smundak
b112214e43 Roboleaf product configuration runner am: 24159db21e
Original change: https://android-review.googlesource.com/c/platform/build/+/1475299

Change-Id: I99ab1bfb16819cebd794050c87a73a7eb8687a53
2021-03-31 19:52:48 +00:00
Alexander Smundak
fe5799af6b Merge changes from topic "product_config_star"
* changes:
  Product configuration in Starlark support files.
  Roboleaf product configuration runner
2021-03-31 18:28:50 +00:00
Yi-Yo Chiang
df13f6f6c8 gsi_skip_mount.cfg skips system sub-mountpoints
Bug: 184132970
Test: GSI Boot test
Change-Id: I6cb6735d41b6dc6c19a27d730226b200d362bc1d
2021-04-01 00:59:16 +08:00
Ulya Trafimovich
4b4fd16c11 Add documentation for <uses-library> checks.
Bug: 132357300
Test: m nothing
Test: check that markdown looks ok in gitiles on gerrit
Change-Id: I2019f65cc69b467889f8dda720b2a4264eae36d7
2021-03-31 11:56:45 +01:00
Ryan Prichard
4637ec0d30 Merge "Revert "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: cf5487e07f
Original change: https://android-review.googlesource.com/c/platform/build/+/1658965

Change-Id: I8c535beddd2c435f8a557bd189d8c369049a4634
2021-03-31 05:52:22 +00:00
Ryan Prichard
cf5487e07f Merge "Revert "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" 2021-03-31 05:29:51 +00:00
Yo Chiang
cece85f781 Merge "Mark PRODUCT_CHECK_ELF_FILES as obsolete" am: d054de08c3
Original change: https://android-review.googlesource.com/c/platform/build/+/1657819

Change-Id: I2a36a905e049c584e1c4f944ed7f4e6f857e3037
2021-03-31 05:01:24 +00:00
Yo Chiang
d054de08c3 Merge "Mark PRODUCT_CHECK_ELF_FILES as obsolete" 2021-03-31 04:26:06 +00:00
Yi-Yo Chiang
f35afe97b1 Mark PRODUCT_CHECK_ELF_FILES as obsolete
Follow-up of aosp/1655468.

Bug: 149715904
Test: Presubmit
Change-Id: I3998c7356e3a41adaa00ab3d1d2c2ec66e2e37d7
2021-03-31 04:25:55 +00:00
Ryan Prichard
9cd4aff304 Revert "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"
This reverts commit 85a1213232.

Reason for revert: b/184095989

Change-Id: I4643a7bb2fea6411d7c673ec4017fdbab6070b9d
2021-03-31 03:25:26 +00:00
Bowgo Tsai
42131496c8 Adding bootimage_test_harness artifact to droidcore
Currently bootimage_test_harness is only built on a few targets
on release branches. However, we might have a last minute build
breakage on release branches as bootimage_test_harness is not
built on dev branches. Moving it to droidcore so we can have more
completed build coverage on pre-submit/post-submit builds.

Bug: 183865297
Test: `make` then check $OUT
Change-Id: I496609401a9444706726256d2f7b45c6bb69ee94
2021-03-31 03:11:14 +00:00
Jaewoong Jung
84dd7e4a69 Merge "Fix the help script." am: a0e69fc900
Original change: https://android-review.googlesource.com/c/platform/build/+/1654388

Change-Id: I2890abcf9da08da88ed868b9c3e506d79304e00e
2021-03-30 23:10:10 +00:00
Dan Albert
77809d7654 Merge "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt" am: ee90c8856e
Original change: https://android-review.googlesource.com/c/platform/build/+/1554922

Change-Id: Id2b6bf2f7a968b30c64d38137eaad4f3678153aa
2021-03-30 23:09:19 +00:00
Jaewoong Jung
a0e69fc900 Merge "Fix the help script." 2021-03-30 23:05:52 +00:00
Dan Albert
ee90c8856e Merge "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt" 2021-03-30 21:44:35 +00:00
Chris Wailes
ea8111cff4 Add the service-art JAR to the System Server classpath.
Bug: 177273468
Test: m
Merged-In: Iddf07fb98a86d626c993b7b175a25413f42b833c
Change-Id: Iddf07fb98a86d626c993b7b175a25413f42b833c
2021-03-30 12:38:01 -07:00