aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAayush Gupta <aayushgupta219@gmail.com>2021-03-20 06:43:47 +0000
committerJeferson Oliveira <jroliveira.oliveira301@gmail.com>2021-04-12 13:17:40 +0200
commit267c01f1771ec31683871fe05fde454da8d3fe15 (patch)
treea995a99e461cae8db911085990f5680acfae2de0
parent472d1c502ccfca94995bdab3248d2cb7bea222a4 (diff)
harpia: 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_harpia.mk2
-rw-r--r--device.mk3
-rw-r--r--full_harpia.mk24
3 files changed, 4 insertions, 25 deletions
diff --git a/aicp_harpia.mk b/aicp_harpia.mk
index 161c1c4..942c936 100644
--- a/aicp_harpia.mk
+++ b/aicp_harpia.mk
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$(call inherit-product, device/motorola/harpia/full_harpia.mk)
+$(call inherit-product, device/motorola/harpia/device.mk)
# Boot animation
TARGET_SCREEN_WIDTH := 720
diff --git a/device.mk b/device.mk
index e0937bc..6983114 100644
--- a/device.mk
+++ b/device.mk
@@ -59,3 +59,6 @@ PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \
$(LOCAL_PATH)/overlay-lineage/lineage-sdk \
$(LOCAL_PATH)/overlay/packages/apps/Snap
+# Get non-open-source specific aspects
+$(call inherit-product, vendor/motorola/harpia/harpia-vendor.mk)
+
diff --git a/full_harpia.mk b/full_harpia.mk
deleted file mode 100644
index 17a373d..0000000
--- a/full_harpia.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2016 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 harpia device
-$(call inherit-product, device/motorola/harpia/device.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := harpia
-PRODUCT_NAME := full_harpia
-
-$(call inherit-product-if-exists, vendor/motorola/harpia/harpia-vendor.mk)