Commit graph

7167 commits

Author SHA1 Message Date
Treehugger Robot
0817f06f2a Merge "Emit virtual_ab_compression prop to dynamic_parttiion_info.txt" am: 6e455b8ca3 am: f72ca016c5 am: 9c3a698d81
Original change: https://android-review.googlesource.com/c/platform/build/+/1552075

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9451f3369aabbb932eda4054adcfc00f015302c1
2021-01-20 20:48:45 +00:00
Treehugger Robot
6e455b8ca3 Merge "Emit virtual_ab_compression prop to dynamic_parttiion_info.txt" 2021-01-20 19:04:11 +00:00
Ulya Trafimovich
347be4037e resolve merge conflicts of 56bf7ca8c9 to master
Test: DIST_DIR=$PWD/dist \
    TARGET_BUILD_VARIANT=userdebug \
    vendor/google/build/build_mainline_modules.sh
Bug: None
Change-Id: I66049dfb90c2583ea6687ac3353e3ce3eb973bd4
2021-01-20 12:44:40 +00:00
Treehugger Robot
c895a8a817 Merge "Split out minimal ART dexpreopt config and use it in mainline builds." 2021-01-20 10:04:39 +00:00
Yo Chiang
0d6ffe8c50 Merge "Remove PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE from gsi_release.mk" am: 95bd22edb6 am: b09c7adb3e am: cb3275e0a5
Original change: https://android-review.googlesource.com/c/platform/build/+/1553834

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6857c6a67d91074a9f71bf6410c78efaa4a2a06d
2021-01-20 04:06:01 +00:00
Yo Chiang
cb3275e0a5 Merge "Remove PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE from gsi_release.mk" am: 95bd22edb6 am: b09c7adb3e
Original change: https://android-review.googlesource.com/c/platform/build/+/1553834

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20108c9f0999134ac2838638c5b6abedea9278d9
2021-01-20 04:05:37 +00:00
Yo Chiang
95bd22edb6 Merge "Remove PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE from gsi_release.mk" 2021-01-20 03:27:03 +00:00
Kelvin Zhang
239a79ae19 Emit virtual_ab_compression prop to dynamic_parttiion_info.txt
Test: mm -j && mm -j dist, make sure virtual_ab_compression is set to
true in dynamic_partition_info.txt of target_File.zip

Change-Id: Id0d46bd8ed738b2b69a0c01481b7db0c7127f773
2021-01-19 16:11:32 -05:00
Nicolas Geoffray
897fe0e8df Split out minimal ART dexpreopt config and use it in mainline builds.
The config sets a few system properties that end up in command-line
arguments passed to dex2oat. Without these properties dex2oat invocation
fails, because options -Xms and -Xmx are do not have an argument.

Test: buid_mainline_modules.sh
Bug: 176171716
Change-Id: I4fd1f059aad5d48495948bfd668307de8b3d9ee1
2021-01-19 17:03:30 +00:00
Yo Chiang
2099e6eda2 Remove PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE from gsi_release.mk
PRODUCT_COMPATIBLE_PROPERTY defaults to true now, so we don't need this
override anymore.

Bug: 177495407
Test: Presubmit
Change-Id: I7370570fe230e913d16520b7add9404f2d6ec913
2021-01-18 18:02:28 +08:00
Meng Wang
2a2b8c7dc2 Merge "Add ImsServiceEntitlement app" 2021-01-16 04:52:33 +00:00
Daniel Norman
53e6cc65d8 Merge "Stops including extra VNDK apexes if the VNDK current apex is on vendor." am: fc596c996f am: 3efc0cd50c am: 42ced0a63e
Original change: https://android-review.googlesource.com/c/platform/build/+/1549532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d11544b32061d5038b87794c79978ed9d410e8e
2021-01-15 18:44:11 +00:00
Daniel Norman
42ced0a63e Merge "Stops including extra VNDK apexes if the VNDK current apex is on vendor." am: fc596c996f am: 3efc0cd50c
Original change: https://android-review.googlesource.com/c/platform/build/+/1549532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8438550235a041ea52c9c886d526942ef4daf865
2021-01-15 18:00:47 +00:00
Janis Danisevskis
f244cc64a9 Merge "Update gsi/current.txt with secure clock and shared secret services." am: 46b0d8c8ef am: 024af72520 am: 7bf768b871
Original change: https://android-review.googlesource.com/c/platform/build/+/1541312

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadc293e8041289a5eaa5f82568348aaa9dcb7fe0
2021-01-15 13:55:17 +00:00
Daniel Norman
c3d7fff348 Stops including extra VNDK apexes if the VNDK current apex is on vendor.
This is needed for merged mixed-release builds where the vendor half on
release N contains VNDK current (vN) on /vendor. This change prevents
the system half on release N+k from placing another copy of VNDK vN
on /system_ext.

Test: Build and merge crosshatch with S system and R vendor, boot
Bug: 176993126
Change-Id: I5322931244e060b2e7c92d9578e5eb64b098d1d6
2021-01-14 20:22:48 +00:00
Janis Danisevskis
7bf768b871 Merge "Update gsi/current.txt with secure clock and shared secret services." am: 46b0d8c8ef am: 024af72520
Original change: https://android-review.googlesource.com/c/platform/build/+/1541312

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib71d701bd06d8463d3ffaeb092ed5e4db459d276
2021-01-14 18:48:17 +00:00
Janis Danisevskis
46b0d8c8ef Merge "Update gsi/current.txt with secure clock and shared secret services." 2021-01-14 18:04:02 +00:00
Meng Wang
025fb73656 Add ImsServiceEntitlement app
Bug: 176127289
Test: make
Change-Id: I2a74da2fe927b274828c3d5d88509583470bf65c
2021-01-13 11:34:30 -08:00
Anton Hansson
81c965bca8 Merge "Use 64 bit binder in module builds" am: 75232ce489 am: b27d9c665e
Original change: https://android-review.googlesource.com/c/platform/build/+/1549377

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I953c783ed7b633932bd38f97e53ee3033de7f9f8
2021-01-13 19:02:18 +00:00
Anton Hansson
0bafe32068 Use 64 bit binder in module builds
Add a new BoardConfigModuleCommon for settings of this sort.

Bug: 176840868
Test: forrest module coverage build
Merged-In: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
Change-Id: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
(cherry picked from commit c0423c8dae)
2021-01-13 11:05:20 +00:00
Presubmit Automerger Backend
a43fb599c0 [automerge] Use 64 bit binder in module builds 2p: c0423c8dae
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13327146

Change-Id: Id34b5541f7b362d1418fe42697677cd7036ecd31
2021-01-13 11:05:13 +00:00
Anton Hansson
c0423c8dae Use 64 bit binder in module builds
Add a new BoardConfigModuleCommon for settings of this sort.

Bug: 176840868
Test: forrest module coverage build
Change-Id: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
2021-01-13 11:04:02 +00:00
Chengyou Ho
c9240efbe3 Merge "Add AuthSecret HAL to VNDK-core list" am: fe1d9d4336 am: c3a5f43f65 am: b87347a9d5
Original change: https://android-review.googlesource.com/c/platform/build/+/1540866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd14846290f9b23c63e74f59fed7f66faf9cc0c8
2021-01-12 09:37:13 +00:00
Chengyou Ho
b87347a9d5 Merge "Add AuthSecret HAL to VNDK-core list" am: fe1d9d4336 am: c3a5f43f65
Original change: https://android-review.googlesource.com/c/platform/build/+/1540866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8750b87a1843aa82643704ede6410388a23648b6
2021-01-12 09:00:41 +00:00
ChengYou Ho
c2adfd8efe Add AuthSecret HAL to VNDK-core list
Bug: 176107318
Change-Id: I13dfb105e8aed296028118ec5cc806c220797ff8
2021-01-12 06:01:07 +00:00
Chengyou Ho
acb3bc7320 Merge "Add OemLock HAL to VNDK-core list" am: 991fe0a7d5 am: b5cf092456 am: 3e1c88b960
Original change: https://android-review.googlesource.com/c/platform/build/+/1542704

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10d0c9d873de9535760322b4200c89ae39031bc7
2021-01-11 07:43:35 +00:00
Chengyou Ho
3e1c88b960 Merge "Add OemLock HAL to VNDK-core list" am: 991fe0a7d5 am: b5cf092456
Original change: https://android-review.googlesource.com/c/platform/build/+/1542704

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94b18bc5fd5d9ab56b39b4a23fe91bb38841aedf
2021-01-11 06:54:08 +00:00
ChengYou Ho
2ef12cb1c2 Add OemLock HAL to VNDK-core list
Bug: 176107318
Change-Id: I73da53a2c614c7ef68d07d84fd0e82564d56dbd2
2021-01-11 05:56:58 +00:00
Treehugger Robot
d5769b4014 Merge "Move keymint to security." am: c19b3445ad am: b2c6e5b29d am: ee4e1bd3bb
Original change: https://android-review.googlesource.com/c/platform/build/+/1540595

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I999ffb336abc22df87a820348899106b13c3ea28
2021-01-08 00:29:34 +00:00
Treehugger Robot
ee4e1bd3bb Merge "Move keymint to security." am: c19b3445ad am: b2c6e5b29d
Original change: https://android-review.googlesource.com/c/platform/build/+/1540595

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7523ca0ee3ee163f368194568790469a4a1c121
2021-01-08 00:14:41 +00:00
Treehugger Robot
c19b3445ad Merge "Move keymint to security." 2021-01-07 23:32:09 +00:00
Yifan Hong
552f36c2f2 Merge "Add 5.10-android12-0 KMI for generic_arm64" am: 1ed887f2c3 am: 42de1ac4c0 am: da6e54d6cb
Original change: https://android-review.googlesource.com/c/platform/build/+/1531942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ceb59b8093d4bb2879b0d0a45792dca1cc2e6e4
2021-01-07 22:34:55 +00:00
Yifan Hong
da6e54d6cb Merge "Add 5.10-android12-0 KMI for generic_arm64" am: 1ed887f2c3 am: 42de1ac4c0
Original change: https://android-review.googlesource.com/c/platform/build/+/1531942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45f85b697bc21ba6d92439c0fce5f71571770257
2021-01-07 21:58:34 +00:00
Yifan Hong
1ed887f2c3 Merge "Add 5.10-android12-0 KMI for generic_arm64" 2021-01-07 21:23:10 +00:00
Janis Danisevskis
08764606de Move keymint to security.
Keymint has moved to hardware/interfaces/security, and all HALs under
security should be cfi enabled.

Test: N/A
Change-Id: Ie40f6a04acdb9091bdf5318b889407af89c787e1
2021-01-07 12:06:50 -08:00
Janis Danisevskis
d432027f81 Update gsi/current.txt with secure clock and shared secret services.
Test: N/A
Change-Id: I4a862488081e5eecdddc648d952cf64f01c2b1db
2021-01-07 10:49:33 -08:00
Treehugger Robot
683c2e8696 Merge "Update VNDK list for product modules" am: 939e511748 am: 9120e986a1 am: 9b290f9516
Original change: https://android-review.googlesource.com/c/platform/build/+/1519537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61e7d471db650868ac74a4974aa0006e8fc98d71
2021-01-07 03:16:26 +00:00
Treehugger Robot
9b290f9516 Merge "Update VNDK list for product modules" am: 939e511748 am: 9120e986a1
Original change: https://android-review.googlesource.com/c/platform/build/+/1519537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6384621fe54b2081c49afce2f3b8dc0e2535d2d
2021-01-07 02:25:37 +00:00
Yifan Hong
f57771a299 Add 5.10-android12-0 KMI for generic_arm64
... to build 5.10 GKI APEXes.

Test: TH
Bug: 160995535
Change-Id: I822ac73e8fc23cb957f748d4e6becdc3f7ac9567
2021-01-05 11:51:32 -08:00
Justin Yun
54146eeed8 Update VNDK list for product modules
Add the list for product_available VNDK list.
This will be frozen by the release process.

Bug: 174323911
Test: build
Change-Id: Ic5f045d9210b09eef6d6c15230e8177d8c98bd22
2021-01-05 13:14:11 +09:00
Treehugger Robot
f3615e136b Merge "Include snapuserd in recovery for VABC builds." am: 4a632325a4 am: f4f4ba7300 am: 67c6b1551d
Original change: https://android-review.googlesource.com/c/platform/build/+/1530572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic02c3c45bba3c0ef2c2fa8d3fefd736ff0ad8f60
2020-12-30 09:54:09 +00:00
Treehugger Robot
67c6b1551d Merge "Include snapuserd in recovery for VABC builds." am: 4a632325a4 am: f4f4ba7300
Original change: https://android-review.googlesource.com/c/platform/build/+/1530572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee612ad0f443d5ae9fa9e469785f304394b3d40c
2020-12-30 09:34:44 +00:00
Treehugger Robot
4a632325a4 Merge "Include snapuserd in recovery for VABC builds." 2020-12-30 08:27:43 +00:00
Isaac Chen
b835f3aee3 Merge "Update GF board variable for dynamic partition" am: a886df692e am: 471db4c7c5 am: d180c32852
Original change: https://android-review.googlesource.com/c/platform/build/+/1535670

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac31ecb625100b6c2240d0fbc5b15befe8e6d8f6
2020-12-30 03:32:57 +00:00
Isaac Chen
d180c32852 Merge "Update GF board variable for dynamic partition" am: a886df692e am: 471db4c7c5
Original change: https://android-review.googlesource.com/c/platform/build/+/1535670

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I449949afd95f01561d605a5651e8d183c3cdae1f
2020-12-30 03:16:44 +00:00
Isaac Chen
c311ff6b68 Update GF board variable for dynamic partition
Goldfish specific board variable:

BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE

is used to create misc_info.txt, which is needed to mix GSI or CSI on
Goldfish vendor image, and need to reflect the size of the current
super.img, which is now set to 4G+8M (from 3G+8M previously).

Bug: 174442566
Test: $ lunch aosp_x86_arm-userdebug; m
      $ ls -l $OUT/super.img	# make sure it's 4 GB
      $ grep -i dynamic_partitions_group_size $OUT/misc_info.txt
      super_emulator_dynamic_partitions_group_size=4294967296
Change-Id: Idd0fb302b20780ac97959fabec231a632205d46d
2020-12-25 06:14:43 +00:00
Chong Zhang
1c2093a21b Merge "Move mediatranscoding from system to apex" 2020-12-23 03:28:03 +00:00
Kalesh Singh
6729228eff Merge "Reply: Add stable aidl memtrack hal to vndk list" am: 7af0218468 am: a091b6dadc am: f94cc1793e
Original change: https://android-review.googlesource.com/c/platform/build/+/1534550

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f38177272c513625ebf5d6b79cf250e256344d8
2020-12-23 02:14:39 +00:00
Kalesh Singh
f94cc1793e Merge "Reply: Add stable aidl memtrack hal to vndk list" am: 7af0218468 am: a091b6dadc
Original change: https://android-review.googlesource.com/c/platform/build/+/1534550

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa977c18d36a4e76e9aa1ccaad67eb4c721aec0a
2020-12-23 02:00:43 +00:00
Kalesh Singh
7af0218468 Merge "Reply: Add stable aidl memtrack hal to vndk list" 2020-12-23 01:20:51 +00:00