diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | OWNERS | 1 | ||||
| -rw-r--r-- | edify/Android.bp | 1 | ||||
| -rw-r--r-- | edify/parser.yy | 2 | ||||
| -rw-r--r-- | minui/events.cpp | 6 | ||||
| -rw-r--r-- | recovery-persist.cpp | 18 | ||||
| -rw-r--r-- | updater/Android.bp | 43 | ||||
| -rw-r--r-- | updater/Android.mk | 29 |
8 files changed, 44 insertions, 57 deletions
diff --git a/Android.bp b/Android.bp index a8e032e21..3a8e97883 100644 --- a/Android.bp +++ b/Android.bp @@ -157,7 +157,6 @@ cc_binary { shared_libs: [ "libbase", "liblog", - "libmetricslogger", ], static_libs: [ @@ -1,3 +1,4 @@ +elsk@google.com enh@google.com nhdo@google.com xunchang@google.com diff --git a/edify/Android.bp b/edify/Android.bp index 73048d21c..0ab53d6dd 100644 --- a/edify/Android.bp +++ b/edify/Android.bp @@ -17,6 +17,7 @@ cc_library_static { host_supported: true, vendor_available: true, + recovery_available: true, srcs: [ "expr.cpp", diff --git a/edify/parser.yy b/edify/parser.yy index 3a63c37f8..37bcdd031 100644 --- a/edify/parser.yy +++ b/edify/parser.yy @@ -72,7 +72,7 @@ static Expr* Build(Function fn, YYLTYPE loc, size_t count, ...) { %parse-param {std::unique_ptr<Expr>* root} %parse-param {int* error_count} -%error-verbose +%define parse.error verbose /* declarations in increasing order of precedence */ %left ';' diff --git a/minui/events.cpp b/minui/events.cpp index f331ed68a..87f811225 100644 --- a/minui/events.cpp +++ b/minui/events.cpp @@ -90,9 +90,11 @@ static int inotify_cb(int fd, __unused uint32_t epevents) { // The inotify will put one or several complete events. // Should not read part of one event. - size_t event_len; - int ret = ioctl(fd, FIONREAD, &event_len); + int event_len_int; + int ret = ioctl(fd, FIONREAD, &event_len_int); if (ret != 0) return -1; + if (event_len_int < 0) return -1; + size_t event_len = event_len_int; std::unique_ptr<DIR, decltype(&closedir)> dir(opendir(INPUT_DEV_DIR), closedir); if (!dir) { diff --git a/recovery-persist.cpp b/recovery-persist.cpp index 6dbf86253..ad101ede2 100644 --- a/recovery-persist.cpp +++ b/recovery-persist.cpp @@ -35,12 +35,10 @@ #include <string.h> #include <unistd.h> -#include <limits> #include <string> #include <android-base/file.h> #include <android-base/logging.h> -#include <metricslogger/metrics_logger.h> #include <private/android_logger.h> /* private pmsg functions */ #include "recovery_utils/logging.h" @@ -112,20 +110,6 @@ ssize_t logsave( return android::base::WriteStringToFile(buffer, destination.c_str()); } -// Parses the LAST_INSTALL file and reports the update metrics saved under recovery mode. -static void report_metrics_from_last_install(const std::string& file_name) { - auto metrics = ParseLastInstall(file_name); - // TODO(xunchang) report the installation result. - for (const auto& [event, value] : metrics) { - if (value > std::numeric_limits<int>::max()) { - LOG(WARNING) << event << " (" << value << ") exceeds integer max."; - } else { - LOG(INFO) << "Uploading " << value << " to " << event; - android::metricslogger::LogHistogram(event, value); - } - } -} - int main(int argc, char **argv) { /* Is /cache a mount?, we have been delivered where we are not wanted */ @@ -157,7 +141,6 @@ int main(int argc, char **argv) { if (has_cache) { // Collects and reports the non-a/b update metrics from last_install; and removes the file // to avoid duplicate report. - report_metrics_from_last_install(LAST_INSTALL_FILE_IN_CACHE); if (access(LAST_INSTALL_FILE_IN_CACHE, F_OK) && unlink(LAST_INSTALL_FILE_IN_CACHE) == -1) { PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE_IN_CACHE; } @@ -181,7 +164,6 @@ int main(int argc, char **argv) { // For those device without /cache, the last_install file has been copied to // /data/misc/recovery from pmsg. Looks for the sideload history only. if (!has_cache) { - report_metrics_from_last_install(LAST_INSTALL_FILE); if (access(LAST_INSTALL_FILE, F_OK) && unlink(LAST_INSTALL_FILE) == -1) { PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE; } diff --git a/updater/Android.bp b/updater/Android.bp index 8a60ef76a..cbef43099 100644 --- a/updater/Android.bp +++ b/updater/Android.bp @@ -13,11 +13,7 @@ // limitations under the License. cc_defaults { - name: "libupdater_defaults", - - defaults: [ - "recovery_defaults", - ], + name: "libupdater_static_libs", static_libs: [ "libapplypatch", @@ -45,6 +41,15 @@ cc_defaults { "libcutils", "libutils", ], +} + +cc_defaults { + name: "libupdater_defaults", + + defaults: [ + "recovery_defaults", + "libupdater_static_libs", + ], shared_libs: [ "libcrypto", @@ -64,7 +69,7 @@ cc_defaults { "libext2_uuid", "libext2_e2p", "libext2fs", - ] + ], } cc_library_static { @@ -155,3 +160,29 @@ cc_library_host_static { "include", ], } + +cc_binary_host { + name: "update_host_simulator", + defaults: ["libupdater_static_libs"], + + srcs: ["update_simulator_main.cpp"], + + cflags: [ + "-Wall", + "-Werror", + ], + + static_libs: [ + "libupdater_host", + "libupdater_core", + "libcrypto_static", + "libfstab", + "libc++fs", + ], + + target: { + darwin: { + enabled: false, + }, + }, +} diff --git a/updater/Android.mk b/updater/Android.mk index 6f54d89b8..8a4cd86d9 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -111,32 +111,3 @@ inc := LOCAL_FORCE_STATIC_EXECUTABLE := true include $(BUILD_EXECUTABLE) - -# TODO(xunchang) move to bp file -# update_host_simulator (host executable) -# =============================== -include $(CLEAR_VARS) - -LOCAL_MODULE := update_host_simulator -LOCAL_MODULE_HOST_OS := linux - -LOCAL_SRC_FILES := \ - update_simulator_main.cpp - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include - -LOCAL_CFLAGS := \ - -Wall \ - -Werror - -LOCAL_STATIC_LIBRARIES := \ - libupdater_host \ - libupdater_core \ - $(updater_common_static_libraries) \ - libfstab \ - libc++fs - -LOCAL_MODULE_CLASS := EXECUTABLES - -include $(BUILD_HOST_EXECUTABLE) |