diff options
author | Xin Li <delphij@google.com> | 2018-08-06 16:51:06 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2018-08-06 16:51:06 -0700 |
commit | 2df01e1b1f2da0c096e9caa442ee9a16aab169de (patch) | |
tree | f365eb744d331ceb999f53ad5344d93e83849665 /Android.mk | |
parent | 78628913ee1bd0261107591b59f46a94318c6bf0 (diff) | |
parent | 06257be6e4486bc7337930abca5da3e1a4c7dc6d (diff) | |
download | bt-2df01e1b1f2da0c096e9caa442ee9a16aab169de.tar.gz |
Merge Android Pie into master
Bug: 112104996
Change-Id: Iceb6c4b0c3ca603583759914844d20d3fdc0c3f3
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -5,6 +5,12 @@ ifneq ($(BOARD_IS_AUTOMOTIVE),true) include $(call all-named-subdir-makefiles,msm8960) else ifneq ($(filter msm8994,$(TARGET_BOARD_PLATFORM)),) include $(call all-named-subdir-makefiles,msm8992) + else ifneq ($(filter msm8909,$(TARGET_BOARD_PLATFORM)),) + ifeq ($(TARGET_SUPPORTS_QCOM_3100),true) + include $(call all-named-subdir-makefiles,msm8909w_3100) + else + include $(call all-named-subdir-makefiles,msm8909) + endif else ifneq ($(wildcard $(LOCAL_PATH)/$(TARGET_BOARD_PLATFORM)),) include $(call all-named-subdir-makefiles,$(TARGET_BOARD_PLATFORM)) endif |