Commit graph

69824 commits

Author SHA1 Message Date
Paul Duffin
5e496e7c15 Merge "Remove use of REMOVE_ATB_FROM_BCP" am: 9910b5e43a am: 853c2c867d am: 04173099d5
Original change: https://android-review.googlesource.com/c/platform/build/+/1662001

Change-Id: I891adf770e30ca94e358dfd3f747f83b8a5bdb2c
2021-04-06 15:27:39 +00:00
Paul Duffin
04173099d5 Merge "Remove use of REMOVE_ATB_FROM_BCP" am: 9910b5e43a am: 853c2c867d
Original change: https://android-review.googlesource.com/c/platform/build/+/1662001

Change-Id: Ic0664d1bf5622c7a45760f45670301a633cfb794
2021-04-06 14:41:52 +00:00
Paul Duffin
853c2c867d Merge "Remove use of REMOVE_ATB_FROM_BCP" am: 9910b5e43a
Original change: https://android-review.googlesource.com/c/platform/build/+/1662001

Change-Id: I52f4e89ad6337f57d2f427bab375af5f035cc1b1
2021-04-06 14:13:13 +00:00
Paul Duffin
9910b5e43a Merge "Remove use of REMOVE_ATB_FROM_BCP" 2021-04-06 14:09:30 +00:00
Yo Chiang
0e38bfa5bb Merge "Refactor vendor_boot v4 build logic and add more checks" am: bebc8a35ef am: f19a789d5b am: ba7020ec3d
Original change: https://android-review.googlesource.com/c/platform/build/+/1664081

Change-Id: I10838451c8e3d55c2f4ba7e2dd6db272c9666cb3
2021-04-06 11:06:50 +00:00
Paul Duffin
24f62069d0 Remove use of REMOVE_ATB_FROM_BCP
This change cleans up after the work to remove the android.test.base
classes from the bootclasspath. That work allowed the presence of
android.test.base in the bootclasspath to be configured at build time
to allow the changes to be tested without affecting the standard
Android builds and avoiding having to repeatedly reapply/revert the
changes that excluded android.test.base from the bootclasspath. That
change has been applied and stuck and no builds change the default by
setting REMOVE_ATB_FROM_BCP=false so we no longer need to support that
capability.

This change removes the build time switch to add
framework-atb-backward-compatibility to the bootclasspath and another
change in the same topic merges those classes into the
framework-minus-apex module. So, while a module has been removed from
the bootclasspath the classes available on it have not changed.

Bug: 184331423
Test: m nothing
Change-Id: I9dadaf8b0c2684bf1983b353bb2acf4f42655e1a
2021-04-06 11:53:08 +01:00
Yo Chiang
ba7020ec3d Merge "Refactor vendor_boot v4 build logic and add more checks" am: bebc8a35ef am: f19a789d5b
Original change: https://android-review.googlesource.com/c/platform/build/+/1664081

Change-Id: I93bede273ca12bb17aa431df8b70ea5f9b5a86f6
2021-04-06 10:19:34 +00:00
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
1ef1bc87a7 Merge "Fix Makefile formatting" am: b5bff9a4d3 am: a7a67e0358 am: fb51a1d107
Original change: https://android-review.googlesource.com/c/platform/build/+/1664080

Change-Id: Ied00b66168177c9c6f5f9d76c7de763f9a936556
2021-04-06 09:22:29 +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
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
Yo Chiang
b5bff9a4d3 Merge "Fix Makefile formatting" 2021-04-06 07:27:44 +00:00
Treehugger Robot
de17763432 Merge "Fix builds with enforce_vintf_kernel + !kernel" am: 3c610dd0aa am: 8163f0b665 am: 75257bca9c
Original change: https://android-review.googlesource.com/c/platform/build/+/1663197

Change-Id: I1adf5e389d32e22f0c34fd7f00ccc4b87b12ef74
2021-04-06 05:07:15 +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
Daniel Norman
7c28443ece Merge "Revert "Generate care map after merging target_files"" am: 25444470db am: d32fe918bd am: fff34be7d6
Original change: https://android-review.googlesource.com/c/platform/build/+/1663821

Change-Id: Ic8b9a5e61b37aee169dd5a7542761fb712f6d4fe
2021-04-06 00:47:59 +00:00
Christian Wailes
11d5f6b335 Merge "Add the service-art JAR to the System Server classpath." into sc-dev 2021-04-06 00:02:38 +00: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
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
Daniel Norman
25444470db Merge "Revert "Generate care map after merging target_files"" 2021-04-05 22:43:07 +00: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
c862c754ed Merge "Generate care map after merging target_files" am: f92961248b am: 79c96bf3a9 am: 72eed42550
Original change: https://android-review.googlesource.com/c/platform/build/+/1649488

Change-Id: Ic0e9d6f4406419d4688d1926450e7bf672a17949
2021-04-05 06:34:32 +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
Treehugger Robot
ca7abd489e Merge "Don't disable verity if VABC is disabled" am: d2170430fe am: d2025215c8 am: dd1ee0b78f
Original change: https://android-review.googlesource.com/c/platform/build/+/1649487

Change-Id: Id626c2a3e4bb78eb6be6bd880dfba68819647a19
2021-04-03 02:20:35 +00: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
Elliott Hughes
d63b6a1054 Merge "Remove honggfuzz support." am: 4ac1818cde am: a526577693 am: a6600c241e
Original change: https://android-review.googlesource.com/c/platform/build/+/1663184

Change-Id: I0a6a96a61ec4a195c89fdd3d48a3011f01023a42
2021-04-02 22:56:23 +00: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
2354ab2b2f Merge "Address reviewer comments from the previous commits" am: 14e6f9c708 am: c4c9320095 am: 64b0c66389
Original change: https://android-review.googlesource.com/c/platform/build/+/1661158

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

Change-Id: Ied7e7f393a8c4ca88cfbc7ff33c1412c8588667f
2021-04-02 19:50:12 +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
33eb60f527 Merge "Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: f56f074e06 am: 7249bad17a am: 6751ce0f7c
Original change: https://android-review.googlesource.com/c/platform/build/+/1661419

Change-Id: I5a83799e0f65c509abb3884a819a8f701959ea56
2021-04-02 00:58:03 +00: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