commit 4d7b0e035050543b28ce1c3d584c4e8d9d9f9a81
author big biff <bigbiff@teamw.in> Sat Jan 12 00:23:03 2019 +0100
committer Gerrit Code Review <gerrit2@gerrit.omnirom.org> Sat Jan 12 00:23:03 2019 +0100
tree f6e913a2e1cf2a17aef7e756dced9ad3cde917f4
parent 635874da21e8147e33b5d71507ac8a148ac04fc7
parent 6ac30afd698be67d422e6c0daff6e4488578a0b4

Merge "vold_decrypt: use ANDROID_ROOT for additional compatibility" into android-9.0

Android.mk

diff --git a/Android.mk b/Android.mk
index 8ed4c6c..3b29c7a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,7 @@
 LOCAL_PATH := $(call my-dir)
 commands_TWRP_local_path := $(LOCAL_PATH)
 
-ifdef project-path-for
+ifneq ($(project-path-for),)
     ifeq ($(LOCAL_PATH),$(call project-path-for,recovery))
         PROJECT_PATH_AGREES := true
         BOARD_SEPOLICY_DIRS += $(call project-path-for,recovery)/sepolicy

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index e28becd..e7bf801 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -208,6 +208,9 @@
             ifneq ($(wildcard hardware/interfaces/weaver/Android.bp),)
                 RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.weaver@1.0.so
             endif
+            ifneq ($(wildcard hardware/interfaces/weaver/1.0/Android.bp),)
+                RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.weaver@1.0.so
+            endif
             RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libhardware_legacy.so
         else
             RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster1.so