StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,777 Commits 1 Branch 0 Tags
543f6750c9d9b51f8cc10712a18e756b3347367c
Commit Graph

67777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kelvin Zhang
66ed06fb29 Re-raise exceptions instead of sys.exit 
If we call sys.exit(), code in finally block won't be executed.
Test: th

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

Change-Id: I090e7f4cce848ab79b2463eeb3faaeb9f0e7f1d2
 2021-04-16 20:57:47 +00:00
Liz Kammer
5b6f5a7bcc Add LOCAL_FULL_VINTF_FRAGMENTS to handle full path 
Soong supports references to other modules for vintf_fragments property,
so full paths need to be passed from Soong to make rather than module
local paths.

Test: m droid
Bug: 184567830
Change-Id: Ia7f1cf977de8aeb08d41624277ff6231198222e5
 2021-04-16 16:40:59 -04:00
Colin Cross
06b891d2bd Merge "Do not run "mkdir ./" in codebase root directly" 2021-04-16 20:30:27 +00:00
Jimmy Chen
44e5a6a9c6 Merge "Fix soong_config handling of CompressedApex" am: 507e84a266 
Original change: https://android-review.googlesource.com/c/platform/build/+/1675811

Change-Id: I4cbcdd07f2dcfd645d0a60ce8bae302fcc0ea53c
 2021-04-16 09:55:46 +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
Treehugger Robot
b06302ee80 Merge "Fix bug: repeated restricted effective conditions." am: b2233cf162 
Original change: https://android-review.googlesource.com/c/platform/build/+/1677687

Change-Id: I25252c92e92a3ab54e008670856fb9bf3ed2b620
 2021-04-15 22:31:08 +00:00
Treehugger Robot
b2233cf162 Merge "Fix bug: repeated restricted effective conditions." 2021-04-15 21:51:20 +00:00
Treehugger Robot
e9a711bc23 Merge "Re-raise exceptions instead of sys.exit" am: c1817038f9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1673906

Change-Id: I1be63b63eb12f34ce41d18ba741f086b3961cc7f
 2021-04-15 19:44:16 +00:00
Treehugger Robot
c1817038f9 Merge "Re-raise exceptions instead of sys.exit" 2021-04-15 19:04:57 +00:00
Bob Badour
1f69c4404a Fix bug: repeated restricted effective conditions. 
Test: m all
Change-Id: I0fc8f66dd72e3d3983b9d2b5fa7416c09a776ccc
 2021-04-15 10:59:40 -07:00
Jaewoong Jung
4933028a4b Merge "Add a missing dependency to the prebuilt app rule." am: 08eb6d9308 
Original change: https://android-review.googlesource.com/c/platform/build/+/1673851

Change-Id: Id1207eecd685f7a0ba146060dc65b92c18a0511f
 2021-04-15 16:32:11 +00:00
Nikita Ioffe
eee5a583fc Merge "Re-land "Enable apex compression on all devices with updatable apex" am: 9f539e2ec0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1671807

Change-Id: Ib7d399adece67103a99fb0c4b9d9cf8a72c8db6c
 2021-04-15 16:29:17 +00:00
Jaewoong Jung
08eb6d9308 Merge "Add a missing dependency to the prebuilt app rule." 2021-04-15 16:07:40 +00:00
Nikita Ioffe
9f539e2ec0 Merge "Re-land "Enable apex compression on all devices with updatable apex" 2021-04-15 15:45:25 +00:00
Lucas Wei
3df934b8a8 Re-land "Enable apex compression on all devices with updatable apex 
This reverts commit f8283a8bf6.

Test: device boots
Test: OTA from uncompressed apexes to compressed apexes works
Bug: 169780183
Bug: 184746992
Bug: 185082717
Change-Id: I62e379f44a1dcf8ebd2b3448dc1381cd99427b45
 2021-04-15 15:45:02 +00:00
Ulyana Trafimovich
497baa7fdc Merge "Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES." am: a43c4ff302 
Original change: https://android-review.googlesource.com/c/platform/build/+/1673313

Change-Id: I176fa2a86b6132e13900ab76f20333bec8098554
 2021-04-15 09:38:33 +00:00
Martin Stjernholm
397d7f5c31 Merge "Add new user setup command banchan for module building." am: 7af86b16fc 
Original change: https://android-review.googlesource.com/c/platform/build/+/1671570

Change-Id: I3446cd1016f5cffa6db939be677adb3507543afe
 2021-04-15 09:37:51 +00:00
Ulyana Trafimovich
a43c4ff302 Merge "Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES." 2021-04-15 08:23:34 +00:00
Martin Stjernholm
7af86b16fc Merge "Add new user setup command banchan for module building." 2021-04-15 08:19:08 +00:00
Treehugger Robot
d8d232e23f Merge "Enable GKI 2.0 signing" am: 214382e048 
Original change: https://android-review.googlesource.com/c/platform/build/+/1659680

Change-Id: Ie3fac45b5b3ac38274cc983b0e7b07dfa4fc4312
 2021-04-15 06:31:31 +00:00
Roman Kiryanov
56c9341ba1 Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4" am: ac46742e38 
Original change: https://android-review.googlesource.com/c/platform/build/+/1676586

Change-Id: I95338c4b55ce3352b4ef43c79871debc1bd9ed43
 2021-04-15 06:30:50 +00:00
Treehugger Robot
214382e048 Merge "Enable GKI 2.0 signing" 2021-04-15 06:08:04 +00:00
Roman Kiryanov
ac46742e38 Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4" 2021-04-15 05:47:50 +00:00
Hunter Knepshield
548fb61cd6 Merge "Create a new certificate for 2021 CTS UICCs." am: bca0e63125 
Original change: https://android-review.googlesource.com/c/platform/build/+/1559795

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

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

Change-Id: I3ad28fa43e01fb17a5c405b2513a57b479d03ffa
 2021-04-15 04:42:26 +00:00
Hunter Knepshield
bca0e63125 Merge "Create a new certificate for 2021 CTS UICCs." 2021-04-15 04:18:27 +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
Roman Kiryanov
0a2ef54d3b Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4 
required for androidboot

Bug: 182291166
Test: boot emulator
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ib17f2ec6fb04eb8c7f592ec2a5d6cc886ad783c8
 2021-04-14 18:18:08 -07:00
Paul Duffin
49cd9fb8f6 Merge "Make sure that BootJars is super set of ArtApexJars" am: 4d414336cf 
Original change: https://android-review.googlesource.com/c/platform/build/+/1675810

Change-Id: I385902f04dc7ab96be0dea4fc22811466cd984be
 2021-04-14 22:06:28 +00:00
Paul Duffin
4d414336cf Merge "Make sure that BootJars is super set of ArtApexJars" 2021-04-14 21:24:37 +00:00
Hunter Knepshield
06353ef218 Create a new certificate for 2021 CTS UICCs. 
This certificate will be used to enforce a clean break between "old" CTS
UICCs and new ones. The new UICCs will have hardware support for new
calculations that the old ones aren't capable of.

Old certificate:
./testkey.x509.pem
SHA-1: 61:ED:37:7E:85:D3:86:A8:DF:EE:6B:86:4B:D8:5B:0B:FA:A5:AF:81
SHA-256: A4:0D:A8:0A:59:D1:70:CA:A9:50:CF:15:C1:8C:45:4D:47:A3:9B:26:98:9D:8B:64:0E:CD:74:5B:A7:1B:F5:DC

New certificate:
./cts_uicc_2021.x509.pem
SHA-1: 06:97:71:39:21:E8:65:D0:1C:45:C4:A8:8D:45:7A:9D:96:F4:39:27
SHA-256: CE:7B:2B:47:AE:2B:75:52:C8:F9:2C:C2:91:24:27:98:83:04:1F:B6:23:A5:F1:94:A8:2C:9B:F1:5D:49:2A:A0

We won't yet submit the change to switch the signature of
CtsCarrierApiTestCases, as that will introduce downstream presubmit and
postsubmit failures until the new hardware is available for device labs.

Bug: 178419755
Test: temporarily switch CtsCarrierApiTestCases to be signed with
cts-uicc-2021-testkey, ensure:
  - Suite fails on a device with the old CTS SIM due to lack of carrier
  privileges
  - Suite passes with updated cuttlefish modem simulator ARF content

Change-Id: I7598426bd3e4db90a8f0d8d80ea03468fb30f876
 2021-04-14 14:11:49 -07: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
559d79a186 Merge "Add Rust vendor image support to Make." am: 1e3771f9ed 
Original change: https://android-review.googlesource.com/c/platform/build/+/1666566

Change-Id: If6dcf0f9085bb098002807e1c13460e01b3c88ea
 2021-04-14 19:13:23 +00:00
Paul Duffin
2b90008ccd Merge "Avoid adding jacocoagent to bootclasspath twice" am: 55e6511331 
Original change: https://android-review.googlesource.com/c/platform/build/+/1675809

Change-Id: If2bb9fa5cc433ebf24de26ecd98879e9e658422f
 2021-04-14 19:11:27 +00:00
Ivan Lozano
1e3771f9ed Merge "Add Rust vendor image support to Make." 2021-04-14 19:02:48 +00:00
Kelvin Zhang
6c17ed3185 Re-raise exceptions instead of sys.exit 
Test: th
Change-Id: I3ac343b51eeeaa948712be81b640122f9981137d
 2021-04-14 14:59:12 -04:00
Paul Duffin
55e6511331 Merge "Avoid adding jacocoagent to bootclasspath twice" 2021-04-14 18:27:59 +00:00
Paul Duffin
2e046e6c61 Avoid adding jacocoagent to bootclasspath twice 
Previously:
* If EMMA_INSTRUMENT_FRAMEWORK=true then jacocoagent was
  added to the ART_APEX_JARS which itself is added to
  PRODUCT_BOOT_JARS.
* If EMMA_INSTRUMENT=true then it was added directly to the
  PRODUCT_BOOT_JARS.
* If both were true then it was added in both places ending up on the
  bootclasspath twice.

Bug: 185369704
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true droid
      m droid
Change-Id: Id1d4d1c98455cb2859ed5e4071a0cf14fb40eec4
 2021-04-14 17:50:48 +01:00
Bowgo Tsai
c1bb0247fb Enable GKI 2.0 signing 
This is to check the interity of a generic boot.img.

Note: build/make/target/product/gsi/testkey_rsa2048.pem is generated by:
      `openssl genrsa -out testkey_rsa2048.pem 2048`.

Bug: 177862434
Test: `make bootimage`
      `unpack_bootimg --boot_img $OUT/boot.img --out unpack`
      `avbtool info_image --image ./unpack/boot_signature`
Change-Id: I12ea4c666f71ad6b6c245d629e41904eb8d90858
 2021-04-14 23:26:14 +08: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
f32b226103 Merge "Add test configuration for rust benchmarks." am: 4cce23d7d5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1566318

Change-Id: I46d60fcb3b1da8a0ace18d7b7b7a2069234bad14
 2021-04-14 08:37:14 +00:00
Jeffrey Vander Stoep
4cce23d7d5 Merge "Add test configuration for rust benchmarks." 2021-04-14 08:02:46 +00:00
Bill Yi
5281dda7ee [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 2f4c1cabf7 -s ours 
am skip reason: skip tag Change-Id I6f5f1dc87e27e7c2966d03cfe7992ccfe96de7d1 with SHA-1 48216a8112 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1674947

Change-Id: I4e73c0c3a6f048eb73122d8fe4e9b7f9748e545c
 2021-04-14 05:46:18 +00:00
Bill Yi
2f4c1cabf7 Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" 2021-04-14 04:59:52 +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