commit 0f3100041b379918f8fe71d1f92e725ac5ea918d
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 14 05:11:24 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 14 05:11:24 2021 +0000
tree 4a9e19dc4c45f0708e224690735bd4243a65da53
parent 44b03995859342e0c22ffed8c2f59b70d2d10fcb
parent 76b161d6bbfc3177bd38cceeeb56d4466d6dcbb9

Merge changes from topic "add-file-size"

* changes:
  microdroid: remove redundant mk_microdroid_signature
  microdroid: add "apk" to payload
  microdroid: each partition in payload has size in it

docs/getting_started/yukawa.md

diff --git a/docs/getting_started/yukawa.md b/docs/getting_started/yukawa.md
index 11f6b73..8ff569a 100644
--- a/docs/getting_started/yukawa.md
+++ b/docs/getting_started/yukawa.md
@@ -23,8 +23,8 @@
 $ . build/envsetup.sh
 $ lunch yukawa-userdebug
 $ export TARGET_VIM3L=true
-$ export TARGET_KERNEL_USE=5.4
-$ m -j$(nproc)
+$ export TARGET_KERNEL_USE=5.10
+$ m
 ```
 
 Flash your device and reboot.

zipfuse/Android.bp

diff --git a/zipfuse/Android.bp b/zipfuse/Android.bp
index ec409f9..845508c 100644
--- a/zipfuse/Android.bp
+++ b/zipfuse/Android.bp
@@ -32,6 +32,7 @@
     name: "ZipFuseTest",
     stem: "zipfuse.test",
     defaults: ["zipfuse.defaults"],
+    test_suites: ["general-tests"],
     compile_multilib: "first",
     rustlibs: [
         "libnix",