Commit graph

5558 commits

Author SHA1 Message Date
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
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
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
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
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
Kalesh Singh
0386daa353 Reply: Add stable aidl memtrack hal to vndk list
Bug: 175021432
Test: m; boot;
Change-Id: I68906dde64d70c5be63ddea050b20f320a3e78aa
2020-12-22 20:50:06 +00:00
Anton Hansson
3ce9d68bd3 Merge "Add mainline_sdk device and product" am: 6d10bf974a am: 87e92d6e57 am: 96fb33a5d1
Original change: https://android-review.googlesource.com/c/platform/build/+/1512778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d11513357f5ea21e84668529f1d9534e83f78f8
2020-12-22 13:07:48 +00:00
Anton Hansson
96fb33a5d1 Merge "Add mainline_sdk device and product" am: 6d10bf974a am: 87e92d6e57
Original change: https://android-review.googlesource.com/c/platform/build/+/1512778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I840beb16ef38d5395169b8252615ecae15d20c66
2020-12-22 12:35:00 +00:00
Anton Hansson
6d10bf974a Merge "Add mainline_sdk device and product" 2020-12-22 11:40:32 +00:00
David Anderson
da770507ab Include snapuserd in recovery for VABC builds.
Bug: N/A
Test: snapuserd available in recovery
Change-Id: Ide10a1da72becffad53f1daf2594d57813fc6636
2020-12-21 23:35:45 +00:00
Andy Hung
ec5246ddb8 Merge "Remove libwebrtc_audio_processing" am: d51e4c473f am: 116ae0c6f8 am: de34bec94d
Original change: https://android-review.googlesource.com/c/platform/build/+/1530932

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If34f458321cf8b83ed1e11330913c636de877ffd
2020-12-17 17:41:20 +00:00
Andy Hung
de34bec94d Merge "Remove libwebrtc_audio_processing" am: d51e4c473f am: 116ae0c6f8
Original change: https://android-review.googlesource.com/c/platform/build/+/1530932

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69ec0c3faf3a5325baefefae5ec0de1dfe10b67a
2020-12-17 17:22:24 +00:00
Andy Hung
d51e4c473f Merge "Remove libwebrtc_audio_processing" 2020-12-17 16:14:59 +00:00
Treehugger Robot
0de3a8b99f Merge "Move ro.zygote to vendor" 2020-12-17 07:02:25 +00:00
Treehugger Robot
35f6614178 Merge "Move jacocoagent installation to base_system" am: 98b7ac4602 am: a88a997a7a am: a9bfe835c2
Original change: https://android-review.googlesource.com/c/platform/build/+/1532100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcdc828243382d7ae6dc244192abf6d441baafc1
2020-12-17 01:23:38 +00:00
Treehugger Robot
a9bfe835c2 Merge "Move jacocoagent installation to base_system" am: 98b7ac4602 am: a88a997a7a
Original change: https://android-review.googlesource.com/c/platform/build/+/1532100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3075df9537b0f27de59389f2e32a83009fb8d8c5
2020-12-17 00:49:27 +00:00
Treehugger Robot
98b7ac4602 Merge "Move jacocoagent installation to base_system" 2020-12-17 00:25:50 +00:00
Yifan Hong
42cae00cb0 Move jacocoagent installation to base_system
jacocoagent and its dependencies emits artifacts to system/,
hence it belongs to base_system.mk. It was rather incorrect
to add jacocoagent to EVERY product makefile because those
product makefiles may be enforcing artifact path requirements
(e.g. generic_ramdisk.mk).

Test: EMMA_INSTRUMENT=true m nothing
Bug: 175605139
Bug: 173742069
Change-Id: If9cb93ab8fd69d11e764ab830dc791bbe6106cf5
2020-12-16 09:50:42 -08:00
Treehugger Robot
502400104a Merge "generic_ramdisk.mk add missing slash." am: fb991de5fe am: 3eeefdca5b am: 16bf35b170
Original change: https://android-review.googlesource.com/c/platform/build/+/1530574

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31b5e21a99a5259988f0d778a0a582467df2616d
2020-12-16 15:10:51 +00:00
Treehugger Robot
16bf35b170 Merge "generic_ramdisk.mk add missing slash." am: fb991de5fe am: 3eeefdca5b
Original change: https://android-review.googlesource.com/c/platform/build/+/1530574

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c6edde56092500972c7bef1a01a954087d30fc6
2020-12-16 14:27:18 +00:00
Treehugger Robot
fb991de5fe Merge "generic_ramdisk.mk add missing slash." 2020-12-16 13:53:29 +00:00
Harish Mahendrakar
044ef90bf9 Remove libwebrtc_audio_processing
libwebrtc_audio_processing is no longer used by audio
preprocessing effects

Bug: 175749641
Test: Builds
Change-Id: Id60fe90d481ae74ea617260fb3cf88c0cc7da79b
2020-12-15 21:22:27 -08:00
Kalesh Singh
9e3e2c509c Merge "Revert "Add stable aidl memtrack hal to vndk list"" am: 37638180d6 am: 9ba9be0432 am: 9564f6d6ef
Original change: https://android-review.googlesource.com/c/platform/build/+/1530884

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99e193e1eea3765564253abc61d57123fa48de25
2020-12-16 02:22:57 +00:00
Kalesh Singh
9564f6d6ef Merge "Revert "Add stable aidl memtrack hal to vndk list"" am: 37638180d6 am: 9ba9be0432
Original change: https://android-review.googlesource.com/c/platform/build/+/1530884

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe5412ecba0519b6d6d4ec9ad3d8b557a6d9f253
2020-12-16 01:46:34 +00:00
Kalesh Singh
37638180d6 Merge "Revert "Add stable aidl memtrack hal to vndk list"" 2020-12-16 00:48:05 +00:00
Kalesh Singh
009936a198 Revert "Add stable aidl memtrack hal to vndk list"
Revert "Memtrack HAL stable aidl sepolicy"

Revert "Add android.hardware.memtrack-unstable-ndk_platform"

Revert submission 1518702-memtrack-aidl

Reason for revert: Broken tests and boot time regressions
Reverted Changes:
Ic4dd70e2c:Add android.hardware.memtrack-unstable-ndk_platfor...
Iaf99d0ca4:Add stable aidl memtrack HAL to product packages
Iac54ae2ba:Add stable aidl memtrack hal to vndk list
If310210a3:libmemtrack: Add support for AIDL memtrack HAL
Ib6c634def:Memtrack HAL: Add stable AIDL implementation
I5e1d0e006:Memtrack HAL stable aidl sepolicy

Change-Id: I922441bf3629a5d50672f1466a1f52fb9e2c3cb0
2020-12-16 00:19:38 +00:00
Yifan Hong
e3a09008fb generic_ramdisk.mk add missing slash.
Test: pass
Bug: 173742069
Change-Id: Ie489858ff57cfc24b3cb28c61f85fffed1bbd4db
2020-12-15 13:53:19 -08:00
Anton Hansson
f68f92d3d5 Add mainline_sdk device and product
This device/product is suitable for a soong-only build that builds for
all the architectures needed for mainline modules sdk prebuilts.

Bug: 174315599
Test: TARGET_PRODUCT=mainline_sdk soong_ui --make-mode --skip-kati;
      (inspect soong.variables)
Change-Id: I3ab5d3611e25a666de39752dedaddbf32ddf6df7
2020-12-15 12:48:37 +00:00