Commit Graph

26988 Commits

Author SHA1 Message Date
Treehugger Robot
9c612a36eb Merge "Test changes for build support for test jni_libs" am: f3162034ef am: bcc08a2454 am: ab9ffa8fed
Original change: https://android-review.googlesource.com/c/platform/build/+/1680149

Change-Id: Idda39045f8a58b6abe55b09e2ca934643b4603af
2021-04-20 13:47:58 +00:00
Treehugger Robot
ab9ffa8fed Merge "Test changes for build support for test jni_libs" am: f3162034ef am: bcc08a2454
Original change: https://android-review.googlesource.com/c/platform/build/+/1680149

Change-Id: Ia803969654c14c653c2c4f439d9a725c217f7e1b
2021-04-20 13:20:58 +00:00
Treehugger Robot
f3162034ef Merge "Test changes for build support for test jni_libs" 2021-04-20 12:26:30 +00:00
Treehugger Robot
e52d2e5dbd Merge "Rename ro.product.enforce_debugfs_restrictions" am: 228ef5f05f am: a74fbc00a0 am: 16a42ccf08
Original change: https://android-review.googlesource.com/c/platform/build/+/1676369

Change-Id: I7df1d7b81485aea822a8fdb5bc7adb78bb73ccc9
2021-04-20 07:29:53 +00:00
Treehugger Robot
16a42ccf08 Merge "Rename ro.product.enforce_debugfs_restrictions" am: 228ef5f05f am: a74fbc00a0
Original change: https://android-review.googlesource.com/c/platform/build/+/1676369

Change-Id: I3480132f93acdc8ed2997c23fbf089c65a13d8dd
2021-04-20 06:57:04 +00:00
Treehugger Robot
228ef5f05f Merge "Rename ro.product.enforce_debugfs_restrictions" 2021-04-20 06:07:53 +00:00
Treehugger Robot
279ff055a7 Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." am: 66321c193b am: 759af2af07 am: 0a0ebf40a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1679525

Change-Id: I89dd7773cf3af6ac8e8338454d55253192783e27
2021-04-20 04:00:09 +00:00
Daniel Cardenas
68984aa93a Test changes for build support for test jni_libs
Tested with patches:  aosp/1560314  aosp/1560314/

Bug: 176593487
Test: make tvts aapt
Change-Id: I2a2867726cc39758dfb27a0a12867e20e4af56d7
2021-04-19 20:48:02 -07:00
Treehugger Robot
0a0ebf40a9 Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." am: 66321c193b am: 759af2af07
Original change: https://android-review.googlesource.com/c/platform/build/+/1679525

Change-Id: I966d1ace2845b1a4cdb94d9aa4f1d4bc70b8b7ac
2021-04-20 03:18:50 +00:00
Treehugger Robot
66321c193b Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." 2021-04-20 01:16:45 +00:00
Treehugger Robot
5e0a235465 Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds" am: b4863637a2 am: cb760624f0 am: 538d4135dc
Original change: https://android-review.googlesource.com/c/platform/build/+/1675585

Change-Id: I1294cf6838fb8630c01288c89b2f1ea486fcc358
2021-04-20 00:13:58 +00:00
Treehugger Robot
538d4135dc Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds" am: b4863637a2 am: cb760624f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1675585

Change-Id: Ie043b2c3080f32dc8b33cf9e3f68953e21c39fad
2021-04-19 23:38:55 +00:00
Treehugger Robot
b4863637a2 Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds" 2021-04-19 23:00:57 +00:00
Hridya Valsaraju
31b2e3e388 Rename ro.product.enforce_debugfs_restrictions
Rename ro.product.enforce_debugfs_restrictions appropriately to
ro.product.debugfs_restrictions.enabled as per the sysprop naming
scheme.

Test: build, boot
Bug: 184381659
Change-Id: I65265098caf6382583aa53811f1b3330e58141c0
2021-04-19 17:41:25 +00:00
yangbill
877586c8c8 Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined.
To prevent the argument be cleaned if the same module name with
different unit_test value, treat it as unit test if one of the module is
treated as unit tests.

Bug: 176096135
Test: m out/target/product/generic/module-info.json
Change-Id: Iee4ee1063d47dcba1aaf915ec9e4e56f8c7df787
2021-04-19 20:34:07 +08:00
Colin Cross
79213b8be4 Merge "Do not run "mkdir ./" in codebase root directly" am: 06b891d2bd am: eb325a8841 am: adb57257a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1675586

Change-Id: I2fc256f1debd4256c2393a2a5c4e69573b994fdd
2021-04-16 21:40:47 +00:00
Colin Cross
adb57257a3 Merge "Do not run "mkdir ./" in codebase root directly" am: 06b891d2bd am: eb325a8841
Original change: https://android-review.googlesource.com/c/platform/build/+/1675586

Change-Id: Ib7674ac54b0669029736af11b8dbcdd8aaae0e66
2021-04-16 21:18:31 +00:00
Colin Cross
06b891d2bd Merge "Do not run "mkdir ./" in codebase root directly" 2021-04-16 20:30:27 +00:00
Jimmy Chen
647cffd753 Merge "Fix soong_config handling of CompressedApex" am: 507e84a266 am: 44e5a6a9c6 am: ed5adb9164
Original change: https://android-review.googlesource.com/c/platform/build/+/1675811

Change-Id: I870b0ec1a1f7224662b7c6f808ea381eaaad7461
2021-04-16 10:50:52 +00:00
Jimmy Chen
ed5adb9164 Merge "Fix soong_config handling of CompressedApex" am: 507e84a266 am: 44e5a6a9c6
Original change: https://android-review.googlesource.com/c/platform/build/+/1675811

Change-Id: Ib0889803ce19054106ce9e8b6522204f5b86324c
2021-04-16 10:23:08 +00:00
Jimmy Chen
507e84a266 Merge "Fix soong_config handling of CompressedApex" 2021-04-16 09:38:03 +00:00
Anton Hansson
106e11cfe7 Fix soong_config handling of CompressedApex
add_json_bool treats non-empty variable as "true" by default (which is
conventional in make). Fix treatment of PRODUCT_COMPRESSED_APEX to
support the value false.

Bug: 185537646
Test: OVERRIDE_PRODUCT_COMPRESSED_APEX=false m nothing && \
      grep CompressedApex out/soong/soong.variables
Change-Id: I0562a375be377ab67a1d064e37aff5970c4ac8dd
2021-04-16 10:09:58 +01:00
Elvis Chien
064d91c49b Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds
CFI has been enabled for 32-bit builds but this option
still only works for 64-bit builds

Bug: 179233410

Change-Id: I3a9fed728489021f6c062ad45082b0a2705cec51
2021-04-16 15:31:55 +08:00
Jaewoong Jung
9ddcdfda8d Merge "Add a missing dependency to the prebuilt app rule." am: 08eb6d9308 am: 4933028a4b am: 533b8d05b6
Original change: https://android-review.googlesource.com/c/platform/build/+/1673851

Change-Id: Ifc4b8ed7e1ecc2c01e4282c7cce8cc1076192637
2021-04-15 17:58:43 +00:00
Jaewoong Jung
533b8d05b6 Merge "Add a missing dependency to the prebuilt app rule." am: 08eb6d9308 am: 4933028a4b
Original change: https://android-review.googlesource.com/c/platform/build/+/1673851

Change-Id: If09100eb39bf6040088f42f493fd8bb2a4225e9f
2021-04-15 17:09:05 +00:00
Jaewoong Jung
08eb6d9308 Merge "Add a missing dependency to the prebuilt app rule." 2021-04-15 16:07:40 +00:00
Ulyana Trafimovich
27d5b19988 Merge "Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES." am: a43c4ff302 am: 497baa7fdc am: a442d28d9e
Original change: https://android-review.googlesource.com/c/platform/build/+/1673313

Change-Id: I3be43582140dac66b4a356513e305962dcf8837c
2021-04-15 10:58:37 +00:00
Ulyana Trafimovich
a442d28d9e Merge "Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES." am: a43c4ff302 am: 497baa7fdc
Original change: https://android-review.googlesource.com/c/platform/build/+/1673313

Change-Id: I315eb53520023ab898e05e37901202bde940d0b2
2021-04-15 10:22:56 +00:00
Ulyana Trafimovich
a43c4ff302 Merge "Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES." 2021-04-15 08:23:34 +00:00
Yo Chiang
45b7da678b Merge "Support building recovery as standalone ramdisk in vendor_boot v4" am: 1d1571e543 am: d1060db729 am: eed6d46645
Original change: https://android-review.googlesource.com/c/platform/build/+/1664082

Change-Id: I32c59174d7a4e395362c874ec41d8b5179cfc307
2021-04-15 05:51:22 +00:00
Treehugger Robot
6933b880b8 Merge "Fix evaluation order of (Cfi|Memtag) exclude paths." am: 99802c7544 am: 32f54ff730 am: d0724a792a
Original change: https://android-review.googlesource.com/c/platform/build/+/1671971

Change-Id: I5ba6fe2210d739929b332572981d8351f21acc4a
2021-04-15 05:50:56 +00:00
Yo Chiang
eed6d46645 Merge "Support building recovery as standalone ramdisk in vendor_boot v4" am: 1d1571e543 am: d1060db729
Original change: https://android-review.googlesource.com/c/platform/build/+/1664082

Change-Id: I6a59c787498f762cc68a678a76c28b9e89ec40e4
2021-04-15 05:21:13 +00:00
Treehugger Robot
d0724a792a Merge "Fix evaluation order of (Cfi|Memtag) exclude paths." am: 99802c7544 am: 32f54ff730
Original change: https://android-review.googlesource.com/c/platform/build/+/1671971

Change-Id: If1adec82ce3c87242b5252faa69cb6702b876a7a
2021-04-15 05:21:00 +00:00
Yo Chiang
1d1571e543 Merge "Support building recovery as standalone ramdisk in vendor_boot v4" 2021-04-15 04:02:15 +00:00
Treehugger Robot
99802c7544 Merge "Fix evaluation order of (Cfi|Memtag) exclude paths." 2021-04-15 03:49:38 +00:00
Paul Duffin
d048e75b34 Merge "Make sure that BootJars is super set of ArtApexJars" am: 4d414336cf am: 49cd9fb8f6 am: 8b8ec66ed9
Original change: https://android-review.googlesource.com/c/platform/build/+/1675810

Change-Id: Iac9edd812791ba2a9c98ddb505c252f7a628cb5a
2021-04-14 23:34:11 +00:00
Paul Duffin
8b8ec66ed9 Merge "Make sure that BootJars is super set of ArtApexJars" am: 4d414336cf am: 49cd9fb8f6
Original change: https://android-review.googlesource.com/c/platform/build/+/1675810

Change-Id: I64d281b7eaf8772f5d09b130ca79f5789fc18e39
2021-04-14 22:48:15 +00:00
Paul Duffin
4d414336cf Merge "Make sure that BootJars is super set of ArtApexJars" 2021-04-14 21:24:37 +00:00
Ivan Lozano
65fe71b643 Merge "Add Rust vendor image support to Make." am: 1e3771f9ed am: 559d79a186 am: b2cb6487eb
Original change: https://android-review.googlesource.com/c/platform/build/+/1666566

Change-Id: I9cb899868ef1fc7f6c851962b88718bdc796701d
2021-04-14 20:39:57 +00:00
Ivan Lozano
b2cb6487eb Merge "Add Rust vendor image support to Make." am: 1e3771f9ed am: 559d79a186
Original change: https://android-review.googlesource.com/c/platform/build/+/1666566

Change-Id: I2f52c52390da266fc89e0169c597f25431ab1b7e
2021-04-14 19:53:22 +00:00
Paul Duffin
d418e961c8 Make sure that BootJars is super set of ArtApexJars
When constructing the dexpreopt config it will strip out any entries in
ART_APEX_JARS which are not present in PRODUCT_BOOT_JARS and store the
remainder in ArtApexJars.

Bug: 185391652
Test: lunch sdk_phone_x86_vendor && m nothing
      lunch sdk_phone_x86 && m nothing
Change-Id: I403ef9768a8ac2d222bbd6cfd0a68a2019f67c16
2021-04-14 20:35:58 +01:00
Ivan Lozano
1e3771f9ed Merge "Add Rust vendor image support to Make." 2021-04-14 19:02:48 +00:00
Jeffrey Vander Stoep
233397c145 Merge "Add test configuration for rust benchmarks." am: 4cce23d7d5 am: f32b226103 am: bcc9be437c
Original change: https://android-review.googlesource.com/c/platform/build/+/1566318

Change-Id: Ia6c27e65118c437cfb3edd6bac8e16cbd88dc661
2021-04-14 10:13:17 +00:00
Po Hu
e1e871db1a Do not run "mkdir ./" in codebase root directly
Test: grep "mkdir -p \.\/" out/build-*.ninja
Bug: 185197550
Change-Id: Ic9568ff91006b0cf362d5b5b105eb25ea3e228a8
2021-04-14 17:39:21 +08:00
Jeffrey Vander Stoep
bcc9be437c Merge "Add test configuration for rust benchmarks." am: 4cce23d7d5 am: f32b226103
Original change: https://android-review.googlesource.com/c/platform/build/+/1566318

Change-Id: If769070a94cdf40e4f6520b95bf908c842436dbf
2021-04-14 09:23:28 +00:00
Jeffrey Vander Stoep
4cce23d7d5 Merge "Add test configuration for rust benchmarks." 2021-04-14 08:02:46 +00:00
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