commit af3984d26d70c9fdb2b8e53b28b4a196a33aaeac
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 07 04:20:25 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 07 04:20:25 2017 +0000
tree fd1494edeba7d6de066edf69fa6d67596e07986c
parent 94ea878ae08cf23512a1ecdb169b8c3c6430281b
parent 8cd412feeea8c809fff719206e736acf841bae5d

Merge changes Ia7feaa13,Ib917761e

* changes:
  Add dependency on jacoco-report-classes.jar
  Fix dex_preopt with profile on a soong module

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 135422d..5b0cb2c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1133,10 +1133,9 @@
 recovery_sepolicy := \
     $(TARGET_RECOVERY_ROOT_OUT)/sepolicy \
     $(TARGET_RECOVERY_ROOT_OUT)/plat_file_contexts \
-    $(TARGET_RECOVERY_ROOT_OUT)/vendor_file_contexts \
+    $(TARGET_RECOVERY_ROOT_OUT)/nonplat_file_contexts \
     $(TARGET_RECOVERY_ROOT_OUT)/plat_property_contexts \
-    $(TARGET_RECOVERY_ROOT_OUT)/vendor_property_contexts
-
+    $(TARGET_RECOVERY_ROOT_OUT)/nonplat_property_contexts
 # Passed into rsync from non-recovery root to recovery root, to avoid overwriting recovery-specific
 # SELinux files
 IGNORE_RECOVERY_SEPOLICY := $(patsubst $(TARGET_RECOVERY_OUT)/%,--exclude=/%,$(recovery_sepolicy))