commit 31bcd7c002c0b556790e7fa0db39297f1624e7e1
author Tianjie Xu <xunchang@google.com> Sat Feb 17 00:15:19 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 17 00:15:19 2018 +0000
tree ed61c1e7c2d9b8708ee643156d226028f01cfd03
parent 15e376d792543572749afbc06063b75e966c4d27
parent e40c80d021d667c1400b7a5d1f6d623b8450a47c

Merge "Skip the cache size check on host"

applypatch/Android.bp

diff --git a/applypatch/Android.bp b/applypatch/Android.bp
index b376140..d3efa15 100644
--- a/applypatch/Android.bp
+++ b/applypatch/Android.bp
@@ -30,6 +30,8 @@
 cc_library_static {
     name: "libapplypatch",
 
+    host_supported: true,
+
     defaults: [
         "applypatch_defaults",
     ],

applypatch/applypatch.cpp

diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp
index 04b964b..73701ab 100644
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -450,9 +450,8 @@
     if (MakeFreeSpaceOnCache(bytes) < 0) {
         printf("unable to make %zu bytes available on /cache\n", bytes);
         return 1;
-    } else {
-        return 0;
     }
+    return 0;
 }
 
 // This function applies binary patches to EMMC target files in a way that is safe (the original
@@ -477,7 +476,7 @@
 // become obsolete since we have dropped the support for patching non-EMMC targets (EMMC targets
 // have the size embedded in the filename).
 int applypatch(const char* source_filename, const char* target_filename,
-               const char* target_sha1_str, size_t target_size __unused,
+               const char* target_sha1_str, size_t /* target_size */,
                const std::vector<std::string>& patch_sha1_str,
                const std::vector<std::unique_ptr<Value>>& patch_data, const Value* bonus_data) {
   printf("patch %s: ", source_filename);

applypatch/freecache.cpp

diff --git a/applypatch/freecache.cpp b/applypatch/freecache.cpp
index 0a40baa..ec1d20c 100644
--- a/applypatch/freecache.cpp
+++ b/applypatch/freecache.cpp
@@ -111,6 +111,12 @@
 }
 
 int MakeFreeSpaceOnCache(size_t bytes_needed) {
+#ifndef __ANDROID__
+  // TODO (xunchang) implement a heuristic cache size check during host simulation.
+  printf("Skip making (%zu) bytes free space on cache; program is running on host\n", bytes_needed);
+  return 0;
+#endif
+
   size_t free_now = FreeSpaceForFile("/cache");
   printf("%zu bytes free on /cache (%zu needed)\n", free_now, bytes_needed);
 

otafault/Android.bp

diff --git a/otafault/Android.bp b/otafault/Android.bp
index 91a5d9a..30d5610 100644
--- a/otafault/Android.bp
+++ b/otafault/Android.bp
@@ -15,6 +15,8 @@
 cc_library_static {
     name: "libotafault",
 
+    host_supported: true,
+
     srcs: [
         "config.cpp",
         "ota_io.cpp",