Merge "Otapreopt: Load properties from files" into nyc-dev
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 87f637c..23954ea 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -42,6 +42,8 @@
using namespace android;
+#define LOG_TAG "atrace"
+
#define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0])))
enum { MAX_SYS_FILES = 10 };
@@ -769,6 +771,7 @@
// Read the current kernel trace and write it to stdout.
static void dumpTrace()
{
+ ALOGE("Dumping trace");
int traceFD = open(k_tracePath, O_RDWR);
if (traceFD == -1) {
fprintf(stderr, "error opening %s: %s (%d)\n", k_tracePath,
diff --git a/cmds/installd/commands.cpp b/cmds/installd/commands.cpp
index 15c1036..77bcfc2 100644
--- a/cmds/installd/commands.cpp
+++ b/cmds/installd/commands.cpp
@@ -826,7 +826,9 @@
strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=interpret-only");
have_dex2oat_compiler_filter_flag = true;
} else if (extract_only) {
- strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=verify-at-runtime");
+ // Temporarily make extract-only mean interpret-only, so extracted files will be verified.
+ // b/26833007
+ strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=interpret-only");
have_dex2oat_compiler_filter_flag = true;
} else if (have_dex2oat_compiler_filter_flag) {
sprintf(dex2oat_compiler_filter_arg, "--compiler-filter=%s", dex2oat_compiler_filter_flag);