diff options
| author | Aayush Gupta <aayushgupta219@gmail.com> | 2021-03-20 06:43:47 +0000 |
|---|---|---|
| committer | Tony Jose <gmoto1179@gmail.com> | 2021-04-29 19:32:57 +0530 |
| commit | 7026712c3ac696bb4822356e5d63453d38a45588 (patch) | |
| tree | f042aaa6611dcb36c7338c87c5a854142c21cff3 | |
| parent | 9fe0f1cb695edb84684faccc76df8eb466e91eff (diff) | |
merlin: Make sure proprietary binaries exists before compilation
- Required to boot the OS
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
Signed-off-by: althafvly <althafvly@gmail.com>
Change-Id: Id478ed5b013488f1209f5944e08607180bc1a64a
| -rw-r--r-- | aicp_merlin.mk | 2 | ||||
| -rw-r--r-- | device.mk | 3 | ||||
| -rw-r--r-- | full_merlin.mk | 24 |
3 files changed, 4 insertions, 25 deletions
diff --git a/aicp_merlin.mk b/aicp_merlin.mk index 96dfe53..19daa37 100644 --- a/aicp_merlin.mk +++ b/aicp_merlin.mk @@ -14,7 +14,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 @@ -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 deleted file mode 100644 index 894f41c..0000000 --- a/full_merlin.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (C) 2015 The CyanogenMod Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Inherit from merlin device -$(call inherit-product, device/motorola/merlin/device.mk) - -# Device identifier. This must come after all inclusions -PRODUCT_DEVICE := merlin -PRODUCT_NAME := full_merlin - -$(call inherit-product-if-exists, vendor/motorola/merlin/merlin-vendor.mk) |