commit f065032f5331e1739fe32a2db9df8c91905720f9
author Andreas Gampe <agampe@google.com> Tue Jun 07 23:16:46 2016 -0700
committer Andreas Gampe <agampe@google.com> Tue Jun 07 23:16:46 2016 -0700
tree 18cc6038af5778b8eb6f019a73274bc837447084
parent afa58d175cc3e9adaa4f8df9bc7a8fac5798a50a

Installd: Fix bad merge

Don't cut off the leading dex location character.

Bug: 25612095
Change-Id: Iad556a0bb48c57f3c68ee75ee41f14e88d96b1a8

cmds/installd/commands.cpp

diff --git a/cmds/installd/commands.cpp b/cmds/installd/commands.cpp
index 5ce01f1..7ef0c6b 100644
--- a/cmds/installd/commands.cpp
+++ b/cmds/installd/commands.cpp
@@ -1657,11 +1657,6 @@
         } else if (dexopt_needed == DEXOPT_DEX2OAT_NEEDED) {
             // Pass dex2oat the relative path to the input file.
             const char *input_file_name = get_location_from_path(input_file);
-            if (input_file_name == NULL) {
-                input_file_name = input_file;
-            } else {
-                input_file_name++;
-            }
             run_dex2oat(input_fd.get(),
                         out_fd.get(),
                         image_fd.get(),