diff options
| author | Jiyong Park <jiyong@google.com> | 2020-01-13 11:49:55 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2020-01-13 03:23:19 +0000 |
| commit | a7e19bb81caf1347f9eeb61e516a0db079c5d2e7 (patch) | |
| tree | 4dfa569eeaf58abcf52b6020e237d31492485d73 | |
| parent | 21d269e7686b0b907ab4eb3e261555aed96593f1 (diff) | |
| download | device_generic_trusty-a7e19bb81caf1347f9eeb61e516a0db079c5d2e7.tar.gz device_generic_trusty-a7e19bb81caf1347f9eeb61e516a0db079c5d2e7.tar.bz2 device_generic_trusty-a7e19bb81caf1347f9eeb61e516a0db079c5d2e7.zip | |
Fix build error
conscrypt is no longer available for platform as it has moved to the
conscrypt APEX. That fact was reflected in base_system.mk where
PRODUCT_UPDATABLE_BOOT_JARS has 'com.android.conscrypt:conscrypt'.
However, this qemu target doesn't inherit from base_system.mk and thus
is missing PRODUCT_UPDATABLE_BOOT_JARS. Fixing the error by manually
adding the entry for conscrypt.
(I didn't inherit the entire base_system.mk because that would being
other stuff that might not necessary for the qemu target)
Bug: 147562633
Test: m with qemu_trusty_arm64
Change-Id: I059a65d91813ed32ed3c6c8587018177bf9efb31
| -rw-r--r-- | qemu_trusty_base.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk index 38e4c4d..de5d125 100644 --- a/qemu_trusty_base.mk +++ b/qemu_trusty_base.mk @@ -115,3 +115,6 @@ PRODUCT_BOOT_JARS := \ ims-common \ android.test.base \ +PRODUCT_UPDATABLE_BOOT_JARS := \ + com.android.conscrypt:conscrypt \ + |