commit 635874da21e8147e33b5d71507ac8a148ac04fc7
author big biff <bigbiff@teamw.in> Sun Jan 06 19:30:20 2019 +0100
committer Gerrit Code Review <gerrit2@gerrit.omnirom.org> Sun Jan 06 19:30:20 2019 +0100
tree 94f0a217f328d9f8bb5c50e42d61f3b706311f37
parent 66bcd499e58bf2e1a927c54085fc65e9b95ef7cb
parent 6b3bdfd6faefa8b99c1ee4673a2c78a9b1f62c5f

Merge "Include weaver library in 9.0 trees" into android-9.0

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