Commit Graph

7346 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
a656a7361a Merge "Export prebuilt-info.txt of perbuilts kernel to dist" am: d58ae982cf am: 3a0acd5dbe am: 344e6d261b
Original change: https://android-review.googlesource.com/c/platform/build/+/1652239

Change-Id: Ia4d336d6137c710efe027357103e16aba914bc7b
2021-04-08 12:31:42 +00:00
SzuWei Lin
d58ae982cf Merge "Export prebuilt-info.txt of perbuilts kernel to dist" 2021-04-08 09:24:05 +00:00
Janis Danisevskis
7bc7da051f Merge "Keystore 2.0: Remove keystore and keystore2.enable property." am: bacb3ebb2a am: fd04a29fe0 am: c4f4a4dc5d
Original change: https://android-review.googlesource.com/c/platform/build/+/1626719

Change-Id: I60dcef6658f18a547217fa59cf53b01fa87b3b62
2021-04-07 20:56:01 +00:00
Janis Danisevskis
bacb3ebb2a Merge "Keystore 2.0: Remove keystore and keystore2.enable property." 2021-04-07 19:30:12 +00:00
Yo Chiang
5882361bd1 Merge "gsi_skip_mount.cfg skips system sub-mountpoints" am: 7716d479cc am: 3a29a4bb95 am: 7382c3b81b
Original change: https://android-review.googlesource.com/c/platform/build/+/1659982

Change-Id: I71226eb7dd86567d2cd25159297efe956e146771
2021-04-07 06:51:17 +00:00
Yo Chiang
7382c3b81b Merge "gsi_skip_mount.cfg skips system sub-mountpoints" am: 7716d479cc am: 3a29a4bb95
Original change: https://android-review.googlesource.com/c/platform/build/+/1659982

Change-Id: I09901df8416ddd996941925f1834a7c1de2a9d29
2021-04-07 06:00:43 +00:00
Yo Chiang
7716d479cc Merge "gsi_skip_mount.cfg skips system sub-mountpoints" 2021-04-07 05:04:21 +00:00
Christian Wailes
a033000df4 Merge "Add the service-art JAR to the System Server classpath." am: 8c614d2515 am: 37c941146a
Original change: https://android-review.googlesource.com/c/platform/build/+/1595811

Change-Id: I83a193cf612c0ab4cb38405bd34cefb320c13486
2021-04-06 21:08:50 +00:00
Christian Wailes
8c614d2515 Merge "Add the service-art JAR to the System Server classpath." 2021-04-06 20:30:18 +00:00
Paul Duffin
5e496e7c15 Merge "Remove use of REMOVE_ATB_FROM_BCP" am: 9910b5e43a am: 853c2c867d am: 04173099d5
Original change: https://android-review.googlesource.com/c/platform/build/+/1662001

Change-Id: I891adf770e30ca94e358dfd3f747f83b8a5bdb2c
2021-04-06 15:27:39 +00:00
Paul Duffin
04173099d5 Merge "Remove use of REMOVE_ATB_FROM_BCP" am: 9910b5e43a am: 853c2c867d
Original change: https://android-review.googlesource.com/c/platform/build/+/1662001

Change-Id: Ic0664d1bf5622c7a45760f45670301a633cfb794
2021-04-06 14:41:52 +00:00
Paul Duffin
24f62069d0 Remove use of REMOVE_ATB_FROM_BCP
This change cleans up after the work to remove the android.test.base
classes from the bootclasspath. That work allowed the presence of
android.test.base in the bootclasspath to be configured at build time
to allow the changes to be tested without affecting the standard
Android builds and avoiding having to repeatedly reapply/revert the
changes that excluded android.test.base from the bootclasspath. That
change has been applied and stuck and no builds change the default by
setting REMOVE_ATB_FROM_BCP=false so we no longer need to support that
capability.

This change removes the build time switch to add
framework-atb-backward-compatibility to the bootclasspath and another
change in the same topic merges those classes into the
framework-minus-apex module. So, while a module has been removed from
the bootclasspath the classes available on it have not changed.

Bug: 184331423
Test: m nothing
Change-Id: I9dadaf8b0c2684bf1983b353bb2acf4f42655e1a
2021-04-06 11:53:08 +01:00
Christian Wailes
11d5f6b335 Merge "Add the service-art JAR to the System Server classpath." into sc-dev 2021-04-06 00:02:38 +00:00
Yo Chiang
d8db785ed0 Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""
This reverts commit 1178673d5e.

Reason for revert: reland after aosp/1663197 is submitted

Change-Id: I3e03e62af38f329e24c057748d1e90a09a38a3b8
2021-04-03 14:56:51 +00:00
Elliott Hughes
d63b6a1054 Merge "Remove honggfuzz support." am: 4ac1818cde am: a526577693 am: a6600c241e
Original change: https://android-review.googlesource.com/c/platform/build/+/1663184

Change-Id: I0a6a96a61ec4a195c89fdd3d48a3011f01023a42
2021-04-02 22:56:23 +00:00
Elliott Hughes
a6600c241e Merge "Remove honggfuzz support." am: 4ac1818cde am: a526577693
Original change: https://android-review.googlesource.com/c/platform/build/+/1663184

Change-Id: Ia46e509718525427316575db53be1459cedc1949
2021-04-02 22:10:44 +00:00
Elliott Hughes
a445ef6cde Remove honggfuzz support.
Everyone's on libFuzzer now.

(The "fuzz" referred to in base_system.mk was removed in Android 11, but
this reference was left lying around.)

Bug: http://b/184301511
Test: treehugger
Change-Id: I6fe0f2c37e014647802279a656d2c6c9625b7a44
2021-04-02 10:24:48 -07:00
Chris Wailes
efe5ca180c Add the service-art JAR to the System Server classpath.
Bug: 177273468
Test: m
Merged-In: Iddf07fb98a86d626c993b7b175a25413f42b833c
Change-Id: Iddf07fb98a86d626c993b7b175a25413f42b833c
2021-03-31 12:31:47 -07:00
Yi-Yo Chiang
df13f6f6c8 gsi_skip_mount.cfg skips system sub-mountpoints
Bug: 184132970
Test: GSI Boot test
Change-Id: I6cb6735d41b6dc6c19a27d730226b200d362bc1d
2021-04-01 00:59:16 +08:00
Chris Wailes
ea8111cff4 Add the service-art JAR to the System Server classpath.
Bug: 177273468
Test: m
Merged-In: Iddf07fb98a86d626c993b7b175a25413f42b833c
Change-Id: Iddf07fb98a86d626c993b7b175a25413f42b833c
2021-03-30 12:38:01 -07:00
Yo Chiang
060db4f10e Merge "Revert^2 "Nextgen release: Don't build super_empty.img"" am: 910d352ee6 am: 1fe7d8ccae am: 862dd38076
Original change: https://android-review.googlesource.com/c/platform/build/+/1652241

Change-Id: I5418758e42053eba9e3e00dd52e4ca3a12ff9237
2021-03-30 08:43:53 +00:00
Yo Chiang
862dd38076 Merge "Revert^2 "Nextgen release: Don't build super_empty.img"" am: 910d352ee6 am: 1fe7d8ccae
Original change: https://android-review.googlesource.com/c/platform/build/+/1652241

Change-Id: I85039f4084566191762da1dec9782f7601b7c819
2021-03-30 08:00:00 +00:00