merlin: Make sure proprietary binaries exists before compilation

- Required to boot the OS Signed-off-by: Aayush Gupta <[email protected]> Signed-off-by: althafvly <[email protected]> Change-Id: Id478ed5b013488f1209f5944e08607180bc1a64a
theRay1s · Apr 5, 2021 · c42407a · c42407a
1 parent f6681d7
commit c42407a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 25 deletions.
diff --git a/device.mk b/device.mk
@@ -59,3 +59,6 @@ PRODUCT_PACKAGES += \
 # Thermal
 PRODUCT_COPY_FILES += \
      $(LOCAL_PATH)/configs/thermal-engine-merlin.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-merlin.conf
+
+# Get non-open-source specific aspects
+$(call inherit-product, vendor/motorola/merlin/merlin-vendor.mk)
diff --git a/full_merlin.mk b/full_merlin.mk
diff --git a/lineage_merlin.mk b/lineage_merlin.mk
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$(call inherit-product, device/motorola/merlin/full_merlin.mk)
+$(call inherit-product, device/motorola/merlin/device.mk)
 
 # Boot animation
 TARGET_BOOTANIMATION_HALF_RES := true