Snap for 11819167 from 38085b365ca1106faffd81bce13ca03118cdb064 to busytown-mac-infra-releasebusytown-mac-infra-release

Change-Id: Id66e82c98320cd79c1855d39cb7ad29874afef3d

6 files changed, 18 insertions, 156 deletions

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 16cd238..0000000
--- a/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-$(eval $(call declare-1p-copy-files,device/generic/trusty,))
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 0568c1e..6d1e43c 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,4 +16,4 @@
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/qemu_trusty_arm64.mk
 
-COMMON_LUNCH_CHOICES := qemu_trusty_arm64-userdebug
+COMMON_LUNCH_CHOICES := qemu_trusty_arm64-trunk_staging-userdebug
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 89cd1f1..7d09bb3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -31,7 +31,6 @@ TARGET_2ND_CPU_VARIANT := generic
 
 BOARD_SEPOLICY_DIRS += device/generic/trusty/sepolicy
 
-TARGET_USES_64_BIT_BINDER := true
 
 # We want goldfish build configuration information, but not the resulting
 # QEMU images. QEMU_CUSTOMIZATIONS turns this on without building the images
@@ -44,7 +43,7 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 268435456 # 256M
 TARGET_COPY_OUT_VENDOR := vendor
 # ~100 MB vendor image. Please adjust system image / vendor image sizes
 # when finalizing them.
-BOARD_VENDORIMAGE_PARTITION_SIZE := 8388608 # 8M
+BOARD_VENDORIMAGE_PARTITION_SIZE := 67108864 # 64M
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_FLASH_BLOCK_SIZE := 512
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
diff --git a/init.qemu_trusty.rc b/init.qemu_trusty.rc
index d31d2f2..3571deb 100644
--- a/init.qemu_trusty.rc
+++ b/init.qemu_trusty.rc
@@ -5,7 +5,6 @@ on early-init
     mount debugfs debugfs /sys/kernel/debug mode=755
 
 on post-fs-data
-    setprop vold.post_fs_data_done 1
 # The storage proxy is a vendor binary, and so cannot access /data/ss
     mkdir /data/vendor/ss 700 system system
     mkdir /data/vendor/ss/persist 0770 system system
diff --git a/manifest.xml b/manifest.xml
index abe0a91..d5e9f78 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,147 +1,3 @@
-<manifest version="1.0" type="device" target-level="4">
-    <hal format="hidl">
-        <name>android.hardware.drm</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ICryptoFactory</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IDrmFactory</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.1::ICryptoFactory/clearkey</fqname>
-        <fqname>@1.1::IDrmFactory/clearkey</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.audio.effect</name>
-        <transport>hwbinder</transport>
-        <version>5.0</version>
-        <interface>
-            <name>IEffectsFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.biometrics.fingerprint</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IBiometricsFingerprint</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.configstore</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>ISurfaceFlingerConfigs</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.audio</name>
-        <transport>hwbinder</transport>
-        <version>5.0</version>
-        <interface>
-            <name>IDevicesFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>IAllocator</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.composer</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IComposer</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.power</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IPower</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.camera.provider</name>
-        <transport>hwbinder</transport>
-        <version>2.4</version>
-        <interface>
-            <name>ICameraProvider</name>
-            <instance>legacy/0</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.sensors</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISensors</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.gnss</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IGnss</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.media.omx</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IOmx</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IOmxStore</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.radio</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IRadio</name>
-            <instance>slot1</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>IHealth</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
+<manifest version="1.0" type="device" target-level="5">
+  <!-- DO NOT ADD HALS HERE - use vintf_fragments -->
 </manifest>
diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk
index 0b3d352..97601ce 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,8 +36,11 @@ PRODUCT_PACKAGES += \
     cgroups.json \
     com.android.art \
     com.android.i18n \
+    com.android.os.statsd \
     com.android.runtime \
+    com.android.sdkext \
     dhcpclient \
+    etc_hosts \
     gatekeeperd \
     hwservicemanager \
     init_system \
@@ -101,10 +107,7 @@ PRODUCT_HOST_PACKAGES += \
     sload_f2fs \
     toybox \
 
-PRODUCT_COPY_FILES += \
-    system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \
-    system/core/rootdir/init.usb.configfs.rc:system/etc/init/hw/init.usb.configfs.rc \
-    system/core/rootdir/etc/hosts:system/etc/hosts \
+PRODUCT_PACKAGES += init.usb.rc init.usb.configfs.rc
 
 PRODUCT_FULL_TREBLE_OVERRIDE := true
 
@@ -125,12 +128,18 @@ $(call inherit-product, system/core/trusty/trusty-test.mk)
 
 # Test Utilities
 PRODUCT_PACKAGES += \
+    binderRpcToTrustyTest \
     tipc-test \
-    libtrusty_metrics_test \
+    trusty-coverage-controller \
     trusty-ut-ctrl \
+    trusty_stats_test \
     VtsAidlKeyMintTargetTest \
     VtsHalConfirmationUIV1_0TargetTest \
+    VtsHalGatekeeperTargetTest \
     VtsHalGatekeeperV1_0TargetTest \
     VtsHalKeymasterV3_0TargetTest \
     VtsHalKeymasterV4_0TargetTest \
     VtsHalRemotelyProvisionedComponentTargetTest \
+
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+    ro.adb.secure=0
\ No newline at end of file