Commit Graph

8527 Commits

Author SHA1 Message Date
Nikita Ioffe
63c81449b7 Merge "Revert "Re-land "Enable apex compression on all devices with updatable apex"" 2021-04-27 17:02:58 +00:00
Nikita Ioffe
b695e761f1 Revert "Re-land "Enable apex compression on all devices with updatable apex"
This reverts commit 3df934b8a8.

Reason for revert: Might break weekly DF: b/185708645#comment11

Bug: 185708645
Change-Id: Ia5526e7895d27d230b1394eee666d5b3d73a08f0
2021-04-27 14:49:20 +00:00
Hridya Valsaraju
b566a9e2e4 Enforce debugfs restrictions on GSI builds too.
Debugfs build-time/run-time restrictions must be enabled on GSI builds
as well.

Test: Build, boot
Bug: 184381659
Change-Id: I940b0a2f6e22086dd479004a68bf6ad1cfe9eb13
2021-04-26 22:19:27 -07:00
Anton Hansson
9693d8bd60 Set PRODUCT_SHIPPING_API_LEVEL in module_*
This setting doesn't really make sense for unbundled builds but does
have the side-effect of turning on "full treble", which in turn is used
by some modules (libhidlbase) to conditionally use some particular -D
when compiling. The media.swcodec does not work without this define.

Bug: 185759877
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Merged-In: I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa
Change-Id: I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa
2021-04-23 15:47:21 +01:00
Anton Hansson
22fb13e8d4 Enable CFI for media module paths in module_*
This is a step on the way to make module_arm64 to produce the same
artifacts as aosp_arm64 when building unbundled modules.

Bug: 185765252
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Merged-In: I50d29c1d57849fd915dc771bb8e9f028fbe8efcd
Change-Id: I50d29c1d57849fd915dc771bb8e9f028fbe8efcd
2021-04-23 15:47:15 +01:00
Anton Hansson
af35677f03 Set VNDK version to current for module builds
This setting changes which libraries are included in the media.swcodec
apex, and is a step on the way of eliminating the differences when
building between module_arm64 and aosp_arm64.

Bug: 185769808
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Merged-In: Iafb0194827f984a7ba108f519016d24b2980e2e1
Change-Id: Iafb0194827f984a7ba108f519016d24b2980e2e1
2021-04-23 15:47:05 +01:00
Anton Hansson
316ca63097 Merge "Set VNDK version to current for module builds" am: 85c91dcee9 am: 4daa3fb610 am: ae6fb60a0b am: 1da778ce91
Original change: https://android-review.googlesource.com/c/platform/build/+/1679349

Change-Id: Ia12e64a31f870f23bc0117bef311a7b7bb4e383c
2021-04-22 14:17:50 +00:00
Anton Hansson
1da778ce91 Merge "Set VNDK version to current for module builds" am: 85c91dcee9 am: 4daa3fb610 am: ae6fb60a0b
Original change: https://android-review.googlesource.com/c/platform/build/+/1679349

Change-Id: I6f08948fe90e9a9400cd5e47eaa3f575b2ff9553
2021-04-22 14:00:20 +00:00
Anton Hansson
85c91dcee9 Merge "Set VNDK version to current for module builds" 2021-04-22 12:51:39 +00:00
Anton Hansson
817a8e2c7a Merge "Set PRODUCT_SHIPPING_API_LEVEL in module_*" am: e6c0eee673 am: 8b5677a3f0 am: c4477b5dec am: 3a951869de
Original change: https://android-review.googlesource.com/c/platform/build/+/1679348

Change-Id: I8f4174c1500bd00de9924578da40cacd9cc7dcda
2021-04-21 16:13:31 +00:00
Anton Hansson
3a951869de Merge "Set PRODUCT_SHIPPING_API_LEVEL in module_*" am: e6c0eee673 am: 8b5677a3f0 am: c4477b5dec
Original change: https://android-review.googlesource.com/c/platform/build/+/1679348

Change-Id: I79db70dd014da74bd0cad35edacf0d7372b625b7
2021-04-21 15:46:51 +00:00
Anton Hansson
98b0374cee Merge "Enable CFI for media module paths in module_*" am: e50287e1b5 am: 9e3c0982e7 am: 24df70f1ae am: 8454b6eb5c
Original change: https://android-review.googlesource.com/c/platform/build/+/1679347

Change-Id: Ifd379e0d5468aff119d8c904457d6f69a645dc93
2021-04-21 15:06:55 +00:00
Anton Hansson
8454b6eb5c Merge "Enable CFI for media module paths in module_*" am: e50287e1b5 am: 9e3c0982e7 am: 24df70f1ae
Original change: https://android-review.googlesource.com/c/platform/build/+/1679347

Change-Id: I80e94d47e55c03f615b8c1709671b08776a646f6
2021-04-21 14:47:04 +00:00
Anton Hansson
d0871073ab Set PRODUCT_SHIPPING_API_LEVEL in module_*
This setting doesn't really make sense for unbundled builds but does
have the side-effect of turning on "full treble", which in turn is used
by some modules (libhidlbase) to conditionally use some particular -D
when compiling. The media.swcodec does not work without this define.

Bug: 185759877
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Change-Id: I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa
2021-04-21 14:31:47 +00:00
Anton Hansson
f7ac2d31d4 Enable CFI for media module paths in module_*
This is a step on the way to make module_arm64 to produce the same
artifacts as aosp_arm64 when building unbundled modules.

Bug: 185765252
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Change-Id: I50d29c1d57849fd915dc771bb8e9f028fbe8efcd
2021-04-21 10:19:28 +01:00
Anton Hansson
d7995cc8e7 Set VNDK version to current for module builds
This setting changes which libraries are included in the media.swcodec
apex, and is a step on the way of eliminating the differences when
building between module_arm64 and aosp_arm64.

Bug: 185769808
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Change-Id: Iafb0194827f984a7ba108f519016d24b2980e2e1
2021-04-21 09:58:51 +01:00
Anton Hansson
90f2a6dd8d Make module_* inherit aosp_* am: 708b854c4a am: 35f4022eb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14189924

Change-Id: If1891fac0b27dcdf72ac23beb3ba5e21e55aa46f
2021-04-16 01:21:26 +00:00
Anton Hansson
35f4022eb7 Make module_* inherit aosp_* am: 708b854c4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14189924

Change-Id: Ibfe6f722acdec2cf42ec267a8b583567147ddb3b
2021-04-16 00:55:04 +00:00
Nikita Ioffe
67a4adb7ae Merge "Re-land "Enable apex compression on all devices with updatable apex" am: 9f539e2ec0 am: eee5a583fc am: 39b4cde442 am: 8787f5903b
Original change: https://android-review.googlesource.com/c/platform/build/+/1671807

Change-Id: Ie589f5ea009904db71899896b114b2e0b9dec4a4
2021-04-15 18:38:29 +00:00
Nikita Ioffe
8787f5903b Merge "Re-land "Enable apex compression on all devices with updatable apex" am: 9f539e2ec0 am: eee5a583fc am: 39b4cde442
Original change: https://android-review.googlesource.com/c/platform/build/+/1671807

Change-Id: I8649a032953e86531e5bced40592e1a22a33ceec
2021-04-15 17:58:35 +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
Anton Hansson
708b854c4a Make module_* inherit aosp_*
This reverts a previous effort to build modules without the large number
of config flags in aosp_*, as it caused unintentional diffs and test
failures.

Bug: 184018787
Test: build and install com.android.media.swcodec && adb reboot &&
      wait-for-boot && atest \
      android.provider.cts.media.MediaStore_Video_ThumbnailsTest#testInsertUpdateDelete
Change-Id: I357624136e3e5427ab8077649a699e7f4a2e299e
2021-04-15 15:21:15 +01:00
Martin Stjernholm
e118347e56 Merge the module_* device.mk files into their corresponding product mk
files.

To clean up an unnecessary indirection. Instead introduce a common file
for module products.

Test: lunch module_{arm,arm64,x86,x86_64}
      inspect the build banners
Merged-In: Ia312431a664e731f5d801ee2671f62f5cd23bd51
Change-Id: Ia312431a664e731f5d801ee2671f62f5cd23bd51
2021-04-15 15:19:50 +01:00
Treehugger Robot
9e854d2316 Merge "Enable GKI 2.0 signing" am: 214382e048 am: d8d232e23f am: 6cfc347cd5 am: 2ba225f9f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1659680

Change-Id: I04f64d35431f0cc47818c598998110a124a8f606
2021-04-15 09:38:37 +00:00
Roman Kiryanov
cb19c256aa Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4" am: ac46742e38 am: 56c9341ba1 am: 3f988435a7 am: 1eaa526e97
Original change: https://android-review.googlesource.com/c/platform/build/+/1676586

Change-Id: I036bd7aba2fe8dca3078fadd22e3351e978d8495
2021-04-15 09:37:46 +00:00
Treehugger Robot
2ba225f9f0 Merge "Enable GKI 2.0 signing" am: 214382e048 am: d8d232e23f am: 6cfc347cd5
Original change: https://android-review.googlesource.com/c/platform/build/+/1659680

Change-Id: I53bef0efb5db7b4d321bc9c883d6823a87e492c2
2021-04-15 08:07:36 +00:00
Roman Kiryanov
1eaa526e97 Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4" am: ac46742e38 am: 56c9341ba1 am: 3f988435a7
Original change: https://android-review.googlesource.com/c/platform/build/+/1676586

Change-Id: I3e38f8fd604c36f9c3223c4509ae3e9fdf3a8838
2021-04-15 08:07:27 +00:00
Hunter Knepshield
d175976ebc Merge "Create a new certificate for 2021 CTS UICCs." am: bca0e63125 am: 548fb61cd6 am: 69bb453792 am: eb3515b3d0
Original change: https://android-review.googlesource.com/c/platform/build/+/1559795

Change-Id: I260c9e873e00556472714f74b3fe33f38edc24b8
2021-04-15 06:31:57 +00:00
Treehugger Robot
214382e048 Merge "Enable GKI 2.0 signing" 2021-04-15 06:08:04 +00:00
Hunter Knepshield
eb3515b3d0 Merge "Create a new certificate for 2021 CTS UICCs." am: bca0e63125 am: 548fb61cd6 am: 69bb453792
Original change: https://android-review.googlesource.com/c/platform/build/+/1559795

Change-Id: I09a2737822ea891633fcac09aed7c14af88e336f
2021-04-15 05:51:28 +00:00
Roman Kiryanov
ac46742e38 Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4" 2021-04-15 05:47:50 +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
1561441f1c Merge "Avoid adding jacocoagent to bootclasspath twice" am: 55e6511331 am: 2b90008ccd am: 2635f9f869 am: 84c8ff4eb2
Original change: https://android-review.googlesource.com/c/platform/build/+/1675809

Change-Id: I59ff0c2660f9030afdb19e944ac2b48f2d8e7bbc
2021-04-14 21:21:08 +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
84c8ff4eb2 Merge "Avoid adding jacocoagent to bootclasspath twice" am: 55e6511331 am: 2b90008ccd am: 2635f9f869
Original change: https://android-review.googlesource.com/c/platform/build/+/1675809

Change-Id: I34093b009c2a0149fcf159caede6fae18fb9bb6d
2021-04-14 20:39:42 +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
Yo Chiang
d3649068e3 Merge "Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""" am: dd74264737 am: c4da3f5332 am: e4b461d603 am: 8510485420
Original change: https://android-review.googlesource.com/c/platform/build/+/1664079

Change-Id: I98926208e590a1dfd6e85606f587bb538d335fac
2021-04-13 13:01:33 +00:00
Yo Chiang
8510485420 Merge "Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""" am: dd74264737 am: c4da3f5332 am: e4b461d603
Original change: https://android-review.googlesource.com/c/platform/build/+/1664079

Change-Id: Id2f352e035ceba1e5934337b5ac28be80bc06972
2021-04-13 11:58: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
Hans Boehm
61b7f075eb Merge "Revert "Enable apex compression on all devices with updatable apex"" am: 4f6f55d4e7 am: 73e6a396d5 am: 2d86cdb6ce am: 745e272598
Original change: https://android-review.googlesource.com/c/platform/build/+/1671975

Change-Id: Ie3d176c5233fd839e08c3cbdea63dd2aaffef825
2021-04-10 08:43:13 +00:00
Hans Boehm
745e272598 Merge "Revert "Enable apex compression on all devices with updatable apex"" am: 4f6f55d4e7 am: 73e6a396d5 am: 2d86cdb6ce
Original change: https://android-review.googlesource.com/c/platform/build/+/1671975

Change-Id: Ibb1696dfd20f9d4bac120da8ee71559b2b9cdc65
2021-04-10 08:03:45 +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
567f6a9f2e Merge "Enable apex compression on all devices with updatable apex" am: 359f09fd01 am: 1661d8db01 am: 3cae74dd16 am: 85a6f667b0
Original change: https://android-review.googlesource.com/c/platform/build/+/1652340

Change-Id: I85e339160cb6f1bb54d96b8885ba6e0dfa4da01a
2021-04-09 23:59:44 +00:00
Nikita Ioffe
85a6f667b0 Merge "Enable apex compression on all devices with updatable apex" am: 359f09fd01 am: 1661d8db01 am: 3cae74dd16
Original change: https://android-review.googlesource.com/c/platform/build/+/1652340

Change-Id: Ia435d73b31353c4f0bca6ac0c2e76a821423e6f7
2021-04-09 23:04:54 +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
SzuWei Lin
48aac8b54c Merge "Export prebuilt-info.txt of perbuilts kernel to dist" am: d58ae982cf am: 3a0acd5dbe am: 344e6d261b am: a656a7361a
Original change: https://android-review.googlesource.com/c/platform/build/+/1652239

Change-Id: I075121bf6d4d1a7836f5fd227ec729857a1bde0b
2021-04-08 13:06:33 +00:00