Commit Graph

67777 Commits

Author SHA1 Message Date
Bob Badour
48216a8112 Merge "Fix bug: include all dirs not just the last one." am: f7e9c43464
Original change: https://android-review.googlesource.com/c/platform/build/+/1673848

Change-Id: I6f5f1dc87e27e7c2966d03cfe7992ccfe96de7d1
2021-04-14 00:30:16 +00:00
Bill Yi
d8833cd80d Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2021-04-14 00:27:04 +00:00
Bob Badour
f7e9c43464 Merge "Fix bug: include all dirs not just the last one." 2021-04-14 00:16:12 +00:00
Daniel Norman
ee9131fd93 Merge changes Ic269fa99,I045be7cb am: 4b7ee39a70
Original change: https://android-review.googlesource.com/c/platform/build/+/1672446

Change-Id: I32d7b9a19b1708669471c3eb1f8b2395200bd95c
2021-04-14 00:10:38 +00:00
Treehugger Robot
8bfd75efb5 Merge "Remove grf_required_api_level" am: e58067f70d
Original change: https://android-review.googlesource.com/c/platform/build/+/1674409

Change-Id: I5a20f727b0103ab08c9f4512b63a32929b4d2cfa
2021-04-14 00:09:57 +00:00
Daniel Norman
4b7ee39a70 Merge changes Ic269fa99,I045be7cb
* changes:
  Generate care_map.pb when merging target files packages.
  Moves care map generation logic to common.py, so it can be reused.
2021-04-13 23:54:08 +00:00
Treehugger Robot
e58067f70d Merge "Remove grf_required_api_level" 2021-04-13 23:29:31 +00:00
Jaewoong Jung
d3561eaef0 Add a missing dependency to the prebuilt app rule.
Fixes: 185197439
Test: Manual test with the CLs cherry-picked.
Change-Id: I595d02497c6504d06239bf2e3562a5448b88b346
2021-04-13 15:03:05 -07:00
Mateusz Zięba
5371607b50 Fix bug: include all dirs not just the last one.
Test: m all

Change-Id: I5724f792ee36c2f66786761e5d55b4f6c456753c
2021-04-13 13:14:13 -07:00
Daniel Norman
db8cacc976 Generate care_map.pb when merging target files packages.
Test: build a merged target using Forrest,
      Observe META/care_map.pb
Bug: 182296208
Change-Id: Ic269fa99ec8ed2bd474a2f69b1be1f545c567112
2021-04-13 11:43:02 -07:00
Kelvin Zhang
2732413fa2 Moves care map generation logic to common.py, so it can be reused.
Test: th
Bug: 182296208
Change-Id: I045be7cb208412431d6ab1c26e31d38d2285738b
2021-04-13 11:42:26 -07:00
Evgenii Stepanov
13bc227ef0 Fix evaluation order of (Cfi|Memtag) exclude paths.
Before this change, exclude paths disabled sanitization of targets that
would otherwise be enabled by SanitizeDevice product variable (aka
SANITIZE_TARGET).

With this change, in addition to the above logic, exclude path disables
sanitization of targets that would otherwise be enabled by the
corresponding include path.

Effectively, this change disables sanitization of targets that are
covered by *both* include and exclude paths.

Test: MEMTAG_HEAP_SYNC_INCLUDE_PATHS=system/extras \
      MEMTAG_HEAP_EXCLUDE_PATHS=system/extras/su m su && \
      readelf -n path/to/su | grep .note.android.memtag
Bug: b/184976817
Change-Id: Ifa44b85556c6468fe5a37b5e6864c4ce9561ae2b
2021-04-13 10:11:58 -07:00
Ulya Trafimovich
affbaed3be Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES.
No functional changes.

Bug: 132357300
Test: lunch aosp_cf_x86_64_phone-userdebug && m
Change-Id: Ia43ac9306c40df5bec525ae1b245add57f568ee5
2021-04-13 17:26:28 +01:00
Mitch Phillips
c007630a9a Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap." am: 002dd30e94
Original change: https://android-review.googlesource.com/c/platform/build/+/1674007

Change-Id: I0c0e697ee3a1c1db86ba2315d66dbb3dcb6c1a7d
2021-04-13 15:49:15 +00:00
Ulyana Trafimovich
8b46006319 Merge "Don't expect all Java modules to have a manifest." am: 27db0284d0
Original change: https://android-review.googlesource.com/c/platform/build/+/1669905

Change-Id: I782b9118e2fc31269bc06bed997839d87bf298a1
2021-04-13 15:42:35 +00:00
Mitch Phillips
002dd30e94 Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap." 2021-04-13 15:31:14 +00:00
Ulyana Trafimovich
27db0284d0 Merge "Don't expect all Java modules to have a manifest." 2021-04-13 15:16:37 +00:00
Yo Chiang
a074c7db37 Merge "Support installing modules.options file" am: 7a8965c1fb
Original change: https://android-review.googlesource.com/c/platform/build/+/1664083

Change-Id: Idcbb839c290d9f0c44bec8778eb67bd1ff13dcc6
2021-04-13 12:36:59 +00:00
Ulya Trafimovich
6ef5779c98 Don't expect all Java modules to have a manifest.
Some libraries that go through manifest_check do not have a manifest or
APK, so there is nothing to check LOCAL_USES_LIBRARIES and
LOCAL_OPTIONAL_USES_LIBRARIES against. Handle it as if the manifest had
zero <uses-library> tags: don't fail the build unless the module has
non-empty LOCAL_USES_LIBRARIES or LOCAL_OPTIONAL_USES_LIBRARIES.

Bug: 132357300
Test: lunch cf_x86_64_phone-userdebug && m
Change-Id: I4b1317cfbd93cb6129caba51b56081307a564442
2021-04-13 12:42:44 +01:00
Yo Chiang
7a8965c1fb Merge "Support installing modules.options file" 2021-04-13 09:20:24 +00:00
Justin Yun
48aa78ed3c Remove grf_required_api_level
As we don't fix the grf window, we may not calculate the grf
expiration date and the required api level.
The verification of this will be covered by the tests at run time.

Bug: 176950752
Test: atest --host post_process_props_unittest
Change-Id: I1205f0d9a9da5bc508a49acbcbb7da581800bf45
2021-04-13 17:58:59 +09:00
Yo Chiang
c4da3f5332 Merge "Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""" am: dd74264737
Original change: https://android-review.googlesource.com/c/platform/build/+/1664079

Change-Id: I8445ea0d23d17f1cfa4a54f1672766feafe6eb2f
2021-04-13 08:03:59 +00:00
Yo Chiang
dd74264737 Merge "Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""" 2021-04-13 07:22:25 +00:00
Martin Stjernholm
f692c756f7 Add new user setup command banchan for module building.
It currently uses TARGET_BUILD_APPS just like tapas, but the use case is
different and it may diverge more in the future.

Test: banchan com.android.art
Test: banchan help
Test: banchan
Test: hmm
Bug: 179779520
Change-Id: Iae718e65a2a7212c741c397e03c6f9a6d5ee8951
2021-04-13 02:07:04 +01:00
Hridya Valsaraju
408d898a43 Enforce debugfs restrictions for S launching devices and newer
Starting with Android R, debugfs cannot be mounted on production
devices. In order to minimize the differences w.r.t debugfs between user
and userdebug/eng builds, enforce a set of run-time and build-time
restrictions on debugfs access for S launch devices and newer. For
non-user builds, debugfs can still be accessed by root and by the
dumpstate HAL during bugreport collection.

Bug: 184381659
Test: build/boot
Change-Id: I2af49acd8a5b3440c6ecbf365ab43cdb33ff897a
2021-04-12 16:34:27 -07:00
Mitch Phillips
77e037c887 [MTE] [CFI] Fix CFI -> diag promotion with memtag_heap.
Small typo in the AndroidMk sanitizer config, where adding heap MTE
ended up promoting CFI to diagnostic CFI accidentally, where this isn't
a valid transformation.

Bug: 184397138
Test: lunch aosp_sunfish-userdebug
Test: PRODUCT_MEMTAG_HEAP_ASYNC_INCLUDE_PATHS=\
Test: "hardware/qcom frameworks/opt/net/wifi" \
Test: CFI_INCLUDE_PATHS=hardware/qcom \
Test: m libwifi-hal
Change-Id: I74a03debf0042f2ee004503dd4a0e81131bd9fde
2021-04-12 15:35:47 -07:00
Peter Collingbourne
309b414c20 Merge "Only link the MTE notes against executables." am: ffa65ba8f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1673866

Change-Id: I50504054d65d6d85c508e63284830bc3709b9aab
2021-04-12 22:18:28 +00:00
Peter Collingbourne
ffa65ba8f0 Merge "Only link the MTE notes against executables." 2021-04-12 21:26:05 +00:00
Liz Kammer
f58b8533ed Merge "Add LOCAL_FULL_INIT_RC to handle init_rc full path" am: 5f2d88bee8
Original change: https://android-review.googlesource.com/c/platform/build/+/1665419

Change-Id: I9d9a2111c6667b688b6292e190869d17e66a4ec0
2021-04-12 19:39:49 +00:00
Liz Kammer
5f2d88bee8 Merge "Add LOCAL_FULL_INIT_RC to handle init_rc full path" 2021-04-12 19:05:27 +00:00
Peter Collingbourne
8b80f3e4d5 Only link the MTE notes against executables.
Soong has equivalent logic but it was missing on the .mk side.

Bug: 135772972
Change-Id: I5fc5a387313f6ae43c6510ee63d153aa81fb58b1
2021-04-12 12:04:29 -07:00
Bill Yi
416ba0388c Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE
Merged-In: I1d84aef53b26c067707d16575fe0fa70f9aaaae2
Change-Id: Iaff0e498c580f7bf7018eca1de5e3d0a59493baf
2021-04-12 09:35:17 -07:00
Yo Chiang
88b910385f Merge "Strip whitespace from INTERNAL_VENDOR_RAMDISK_FRAGMENTS" am: 71c7048593
Original change: https://android-review.googlesource.com/c/platform/build/+/1671806

Change-Id: I9daaba574840090e1736e48090123431668c9948
2021-04-12 04:17:33 +00:00
Yo Chiang
71c7048593 Merge "Strip whitespace from INTERNAL_VENDOR_RAMDISK_FRAGMENTS" 2021-04-12 03:33:37 +00:00
Hans Boehm
73e6a396d5 Merge "Revert "Enable apex compression on all devices with updatable apex"" am: 4f6f55d4e7
Original change: https://android-review.googlesource.com/c/platform/build/+/1671975

Change-Id: Ia7aa0437cdde2e3dfd5851822b4dda65d746d5ab
2021-04-10 06:52:05 +00:00
Hans Boehm
4f6f55d4e7 Merge "Revert "Enable apex compression on all devices with updatable apex"" 2021-04-10 05:42:10 +00:00
Hans Boehm
f8283a8bf6 Revert "Enable apex compression on all devices with updatable apex"
This reverts commit eaa853ad3c.

Reason for revert: breaks git_rvc-qpr-dev-plus-aosp build.

Bug: 184989544

Change-Id: Id760adaf99babe53e7cf096180032a9683587006
2021-04-10 01:06:39 +00:00
Nikita Ioffe
1661d8db01 Merge "Enable apex compression on all devices with updatable apex" am: 359f09fd01
Original change: https://android-review.googlesource.com/c/platform/build/+/1652340

Change-Id: Ifeaa81b94a388a08c5774be3bb62b2d6b38e9e68
2021-04-09 22:15:14 +00:00
Nikita Ioffe
359f09fd01 Merge "Enable apex compression on all devices with updatable apex" 2021-04-09 21:39:11 +00:00
Nikita Ioffe
eaa853ad3c Enable apex compression on all devices with updatable apex
Test: atest ApexTestCases
Test: atest CtsStagedInstallHostTestCases
Test: coral boots
Test: checked OTA works
Change-Id: I12938b93731e0bb82b49d5d1f3815e899dafa0bf
2021-04-09 21:38:55 +00:00
Yi-Yo Chiang
378b77929f Strip whitespace from INTERNAL_VENDOR_RAMDISK_FRAGMENTS
aosp/1664081 introduces a bug where if BOARD_VENDOR_RAMDISK_FRAGMENTS is
empty, then INTERNAL_VENDOR_RAMDISK_FRAGMENTS would become " " (single
whitespace).
Just unconditionally $(strip ...) the variable to remove any extra
whitespace.

Bug: 183395459
Test: m dist and check *-target_files-*.zip
Change-Id: Ic842756f3a64c073593592d22c980820664e11c1
2021-04-09 12:32:41 +00:00
Treehugger Robot
b6f695193e Merge "Fix build break for Android.bp dex_import" am: b2fccdd318
Original change: https://android-review.googlesource.com/c/platform/build/+/1644082

Change-Id: I5e79103cfb12537705d4b89b02e74c94beffb828
2021-04-09 06:35:51 +00:00
Treehugger Robot
b2fccdd318 Merge "Fix build break for Android.bp dex_import" 2021-04-09 06:00:27 +00:00
Yi-Yo Chiang
12f92447a5 Support building recovery as standalone ramdisk in vendor_boot v4
If BOARD_BOOT_HEADER_VERSION >= 4,
BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT is true and
BOARD_INCLUDE_RECOVERY_RAMDISK_IN_VENDOR_BOOT is true, then build
recovery as a standalone ramdisk fragment in vendor_boot image.

The recovery ramdisk would be a vendor ramdisk fragment packaged in
vendor_boot, whose ramdisk_name is "recovery" and ramdisk_type is
"VENDOR_RAMDISK_TYPE_RECOVERY".

Bootloader can omit loading the recovery ramdisk during normal boot to
optimize the size of the initramfs.

Bug: 183395459
Test: Presubmit
Test: Modify BoardConfig of CF and m dist. Verify the vendor_boot.img
  with unpack_bootimg.
Test: Strip the vendor_boot of the recovery ramdisk, and verify that CF
  can boot to normal boot without the recovery ramdisk.
Change-Id: I6e9a2781ec87aece10d4844fa18bbe9a7b4674e6
2021-04-09 12:47:00 +08:00
Treehugger Robot
3de9fa6182 Merge "Add a build flag to turn on debugfs restrictions" am: fb65e89346
Original change: https://android-review.googlesource.com/c/platform/build/+/1663700

Change-Id: Ica9bc063548b8ff11f6ba63ed2c369aa7b377a30
2021-04-09 01:04:12 +00:00
Treehugger Robot
fb65e89346 Merge "Add a build flag to turn on debugfs restrictions" 2021-04-09 00:12:02 +00:00
Treehugger Robot
f5f1948f31 Merge "Unify the style of _MakeRamdisk for ramdisk format" am: e2002fb905
Original change: https://android-review.googlesource.com/c/platform/build/+/1662021

Change-Id: I8ea10ac0be31b88ef6c7132748f0bae91738f424
2021-04-08 23:34:50 +00:00
Treehugger Robot
e2002fb905 Merge "Unify the style of _MakeRamdisk for ramdisk format" 2021-04-08 22:44:45 +00:00
Treehugger Robot
c629d903e4 Merge "Remove all unused, legacy FDO build rules" am: f0ed29862f
Original change: https://android-review.googlesource.com/c/platform/build/+/1663788

Change-Id: I8d6c4de171f4e5a091a34a8cf9a6c91e35ee131a
2021-04-08 19:22:09 +00:00
Treehugger Robot
46f79f24be Merge "Remove legacy host shared library linking with gcov" am: 13ebf1bdf5
Original change: https://android-review.googlesource.com/c/platform/build/+/1663784

Change-Id: Ifef52230280b1de2f6a1ece15b37154f3e1914df
2021-04-08 19:21:05 +00:00