diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2019-12-01 13:46:34 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2019-12-01 13:46:34 +0200 |
| commit | 7becaa990cef07ecdb063e1c92a6f96d5fa5456e (patch) | |
| tree | d04af700881a061d10e6890e630f86d92873704f | |
| parent | 6cd1ab0acd1af48cf981692f51f88437a16695c4 (diff) | |
| download | android_hardware_qcom-caf_common-lineage-17.0.tar.gz android_hardware_qcom-caf_common-lineage-17.0.tar.bz2 android_hardware_qcom-caf_common-lineage-17.0.zip | |
Simplify and fix AOSP guardlineage-17.0
Change-Id: I2f01a16b3fc16602fa2f1675ae6ebbcb7ece6ff5
| -rw-r--r-- | os_pickup_aosp.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/os_pickup_aosp.mk b/os_pickup_aosp.mk index b3c6bc2..343a28e 100644 --- a/os_pickup_aosp.mk +++ b/os_pickup_aosp.mk @@ -1,14 +1,11 @@ # This file guards most of hardware/qcom/* from # being used on devices which use hardware/qcom-caf/* -# Legacy CAF devices still want AOSP keymaster HAL. -CAF_DIRS := keymaster LOCAL_PATH := $(call my-dir) +# Legacy CAF devices still want AOSP keymaster HAL. ifeq ($(BOARD_USES_QCOM_HARDWARE),true) -# convert CAF_DIRS to something we can give to filter -filter_CAF_DIRS := $(foreach dir,$(CAF_DIRS),%/$(dir)/Android.mk) -include $(filter,$(filter_CAF_DIRS),$(call first-makefiles-under,$(LOCAL_PATH))) +include $(LOCAL_PATH)/keymaster/Android.mk else include $(call first-makefiles-under,$(LOCAL_PATH)) endif |