StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,147 Commits 1 Branch 0 Tags
0b51b5a247a70b0558ba63b5d6ef0a4fd31fc262
Commit Graph

26992 Commits

Author SHA1 Message Date
Bill Yi
21e8c35b78 Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE 
Merged-In: I6f5f1dc87e27e7c2966d03cfe7992ccfe96de7d1
Merged-In: I9ae926913e3b6409e4b5ffff40ee72b2f42290ea
Change-Id: Icdb6feab48152418ee3e3d44a6d039225a11dbbf
 2021-04-13 19:31:56 -07: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
Paul Scovanner
b862fdf0a8 Update Security String to 2021-06-05 am: deaeaecae3 am: 9c4bacfd42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14161908

Change-Id: I1d608ce127533022dc576b27ac0d5187894134b0
 2021-04-13 18:06:45 +00:00
Paul Scovanner
7d063238d8 Update Security String to 2021-06-05 am: deaeaecae3 am: 307e58c439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14161908

Change-Id: Id6d3fb94d0a7ec24017601ad32e42ba16246219b
 2021-04-13 17:40:50 +00:00
Mitch Phillips
74ef52d288 Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap." am: 002dd30e94 am: c007630a9a am: 378b93caa0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1674007

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

Change-Id: I3a659cb0f6cb578277dda5a3243070652d788410
 2021-04-13 17:17:26 +00:00
Paul Scovanner
9c4bacfd42 Update Security String to 2021-06-05 am: deaeaecae3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14161908

Change-Id: Id6b1cda27703c59d7a9760ddd71dda60785f7b2e
 2021-04-13 17:17:04 +00:00
Paul Scovanner
307e58c439 Update Security String to 2021-06-05 am: deaeaecae3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14161908

Change-Id: Ia0f6f832cfc4e1cabc3d996159a682d911eee972
 2021-04-13 17:12:13 +00: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
Mitch Phillips
378b93caa0 Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap." am: 002dd30e94 am: c007630a9a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1674007

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

Change-Id: I5d7389a581381235aa183ba9ab92f5c9d643f382
 2021-04-13 16:26:40 +00: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
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
717c238d65 Merge "Support installing modules.options file" am: 7a8965c1fb am: a074c7db37 am: d1131447db 
Original change: https://android-review.googlesource.com/c/platform/build/+/1664083

Change-Id: I6ca52534fef5d251e971b488d22fabc953a2176e
 2021-04-13 14:20:00 +00:00
Yo Chiang
d1131447db Merge "Support installing modules.options file" am: 7a8965c1fb am: a074c7db37 
Original change: https://android-review.googlesource.com/c/platform/build/+/1664083

Change-Id: If8c2e67437e3008e177633a9cb3bce6d706d9c4b
 2021-04-13 13:22:43 +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
Peter Collingbourne
5695ee0248 Merge "Only link the MTE notes against executables." am: ffa65ba8f0 am: 309b414c20 am: 9199e4c04d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1673866

Change-Id: I5b3e3603bb605f851b9f50f86b7cad817112e5a1
 2021-04-12 23:48:27 +00:00
Peter Collingbourne
9199e4c04d Merge "Only link the MTE notes against executables." am: ffa65ba8f0 am: 309b414c20 
Original change: https://android-review.googlesource.com/c/platform/build/+/1673866

Change-Id: I40edc800fa73b5338cd9570dfe81cc7a3e27d401
 2021-04-12 23:00:15 +00: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
ffa65ba8f0 Merge "Only link the MTE notes against executables." 2021-04-12 21:26:05 +00:00
Paul Scovanner
deaeaecae3 Update Security String to 2021-06-05 
Bug: 185154903
Change-Id: Ibfaf0bcc7e4525786eca62cafc7548030be40c61
 2021-04-12 21:03:24 +00:00
Liz Kammer
5a3c65f9f5 Merge "Add LOCAL_FULL_INIT_RC to handle init_rc full path" am: 5f2d88bee8 am: f58b8533ed am: 8ccfb3b13b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1665419

Change-Id: I3bc7c1505cd8afff738d2b0cc3ec023715a5f1a7
 2021-04-12 20:59:48 +00:00
Liz Kammer
8ccfb3b13b Merge "Add LOCAL_FULL_INIT_RC to handle init_rc full path" am: 5f2d88bee8 am: f58b8533ed 
Original change: https://android-review.googlesource.com/c/platform/build/+/1665419

Change-Id: I736cacd89b2607ee0d857e3cd8670e99c0a43ff8
 2021-04-12 20:09:10 +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
Yo Chiang
6aa3381900 Merge "Strip whitespace from INTERNAL_VENDOR_RAMDISK_FRAGMENTS" am: 71c7048593 am: 88b910385f am: fbfd3e96ef 
Original change: https://android-review.googlesource.com/c/platform/build/+/1671806

Change-Id: Ibb619873cf0d9efa517d484d1a3fedc3d6284fd4
 2021-04-12 05:57:26 +00:00
Yo Chiang
fbfd3e96ef Merge "Strip whitespace from INTERNAL_VENDOR_RAMDISK_FRAGMENTS" am: 71c7048593 am: 88b910385f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1671806

Change-Id: I1d84aef53b26c067707d16575fe0fa70f9aaaae2
 2021-04-12 05:07:55 +00:00
Yo Chiang
71c7048593 Merge "Strip whitespace from INTERNAL_VENDOR_RAMDISK_FRAGMENTS" 2021-04-12 03:33:37 +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
b1e57555b4 Merge "Fix build break for Android.bp dex_import" am: b2fccdd318 am: b6f695193e am: 823cf7297a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1644082

Change-Id: Ie4e4d18ca96fa283774a47723a137171ac2d13e3
 2021-04-09 08:04:25 +00:00
Treehugger Robot
823cf7297a Merge "Fix build break for Android.bp dex_import" am: b2fccdd318 am: b6f695193e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1644082

Change-Id: I67a237d01d713e8af1cced27ad940a5ec20b3a2c
 2021-04-09 07:17:15 +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
aa2f6f2e3f Merge "Add a build flag to turn on debugfs restrictions" am: fb65e89346 am: 3de9fa6182 am: e252975036 
Original change: https://android-review.googlesource.com/c/platform/build/+/1663700

Change-Id: I4f14fbcbcf7dbc509a48f1e1b350a7747a59b6c8
 2021-04-09 01:30:32 +00:00
Treehugger Robot
e252975036 Merge "Add a build flag to turn on debugfs restrictions" am: fb65e89346 am: 3de9fa6182 
Original change: https://android-review.googlesource.com/c/platform/build/+/1663700

Change-Id: I52a23bfb501b26794b29d424c72c544491ab491e
 2021-04-09 01:24:23 +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
a12445c548 Merge "Remove all unused, legacy FDO build rules" am: f0ed29862f am: c629d903e4 am: c4e811e8d1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1663788

Change-Id: Iea4f373cab5dec8a38aa829ef2fff0b812377bca
 2021-04-08 20:29:31 +00:00
Treehugger Robot
c135ff5fff Merge "Remove legacy host shared library linking with gcov" am: 13ebf1bdf5 am: 46f79f24be am: e3bc7f3a79 
Original change: https://android-review.googlesource.com/c/platform/build/+/1663784

Change-Id: Ib343d55e450bc539fdfc913e33d0e0cbf8cee41e
 2021-04-08 20:29:10 +00:00
Treehugger Robot
c4e811e8d1 Merge "Remove all unused, legacy FDO build rules" am: f0ed29862f am: c629d903e4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1663788

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

Change-Id: I97bbe6c601e99a708845e268d1fdd89bca6f2355
 2021-04-08 20:01:34 +00:00
Colin Cross
b7d61d8776 Merge "Package jacoco and proguard files out of a PACKAGING directory" am: df682c6fe1 am: 20f7c8aa14 am: c501f5e0ae 
Original change: https://android-review.googlesource.com/c/platform/build/+/1666060

Change-Id: Icb09a21be58fc92f90ab48649049759948a1d914
 2021-04-08 19:25:19 +00:00
Colin Cross
c501f5e0ae Merge "Package jacoco and proguard files out of a PACKAGING directory" am: df682c6fe1 am: 20f7c8aa14 
Original change: https://android-review.googlesource.com/c/platform/build/+/1666060

Change-Id: Icfcc9ecf69ab23309ba1f4a1626a95d0ec82c997
 2021-04-08 18:38:39 +00:00
Treehugger Robot
f0ed29862f Merge "Remove all unused, legacy FDO build rules" 2021-04-08 18:31:40 +00:00
Treehugger Robot
13ebf1bdf5 Merge "Remove legacy host shared library linking with gcov" 2021-04-08 18:31:08 +00:00
Colin Cross
df682c6fe1 Merge "Package jacoco and proguard files out of a PACKAGING directory" 2021-04-08 17:17:53 +00:00
Liz Kammer
382be36c43 Add LOCAL_FULL_INIT_RC to handle init_rc full path 
Soong supports references to other modules for init_rc property, so full
paths need to be passed from Soong to make rather than module local
paths.

Test: m droid dist
Bug: 184567830
Change-Id: Ib1873a3418830f5cbf32e26f55d3ad0ab0d9c9c5
 2021-04-08 11:33:46 -04:00
Treehugger Robot
b52b0c027c Merge "Use BOARD_API_LEVEL to define ro.board.api_level" am: 222b4ab071 am: bcadcb4c8f am: cd2621f177 
Original change: https://android-review.googlesource.com/c/platform/build/+/1662022

Change-Id: I5e92476f760690139018c7b7bc2d0e3f9f5ee0f9
 2021-04-08 02:21:14 +00:00
Colin Cross
330b1fef31 Package jacoco and proguard files out of a PACKAGING directory 
Package jacoco-report-classes.jar, proguard_usage.zip and
proguard_dictionary out of directories in $OUT/obj/PACKAGING
so that they get cleared by m installclean.  This will make
incremental builds that package these files accurate as long
as installclean was run, which is much faster than a full clean
build.

Bug: 184583915
Test: m TARGET_BUILD_APPS=DeskClock EMMA_INSTRUMENT=true dist
Change-Id: I60c6a0fec1fbce26eab8d5adab25a2231b48e251
 2021-04-07 18:52:02 -07:00