diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-04-26 19:57:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-26 19:57:45 +0000 |
| commit | 96433df6a34a57ac3449f7c140571188c1340beb (patch) | |
| tree | c0f2f23de6242145833a1136e94379905f4b7485 | |
| parent | 038536b1d53171902485615b3428ea02007f049c (diff) | |
| parent | 095d164b14434b32eae80946b35940153681bb8f (diff) | |
| download | trusty-96433df6a34a57ac3449f7c140571188c1340beb.tar.gz | |
Merge changes I971a63b9,Ic64cac06 am: 43a934af31 am: 095d164b14
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/2563552
Change-Id: I62514753ee1480bd740537e3f55de013e4d901e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | qemu_trusty_base.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk index 00ed815..51d4f17 100644 --- a/qemu_trusty_base.mk +++ b/qemu_trusty_base.mk @@ -21,10 +21,13 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/default_art_config.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) +$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) + PRODUCT_SOONG_NAMESPACES += device/generic/goldfish PRODUCT_PACKAGES += \ com.android.adbd \ + com.android.virt \ adbd_system_api \ android.hardware.confirmationui@1.0-service.trusty \ android.hidl.allocator@1.0-service \ @@ -33,7 +36,9 @@ PRODUCT_PACKAGES += \ cgroups.json \ com.android.art \ com.android.i18n \ + com.android.os.statsd \ com.android.runtime \ + com.android.sdkext \ dhcpclient \ gatekeeperd \ hwservicemanager \ @@ -135,3 +140,6 @@ PRODUCT_PACKAGES += \ VtsHalKeymasterV3_0TargetTest \ VtsHalKeymasterV4_0TargetTest \ VtsHalRemotelyProvisionedComponentTargetTest \ + +PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ + ro.adb.secure=0
\ No newline at end of file |