diff options
| author | Patrick Tjin <pattjin@google.com> | 2016-05-06 13:48:09 -0700 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2016-05-06 13:48:09 -0700 |
| commit | 757c4d63a1d2a557289806c7ffa98cfb48a779c4 (patch) | |
| tree | 2a09f43cbc84d67d3adf514f4147da02ecc131b8 /Android.mk | |
| parent | 38010aca759affb36526dfb93b3a15cac8f54dce (diff) | |
| parent | 8f1e8550bcd102564e2d5b1450762efe196136ef (diff) | |
| download | bt-757c4d63a1d2a557289806c7ffa98cfb48a779c4.tar.gz | |
resolve merge conflicts of 8f1e855 to master
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ # adp8064 and fox box do not share BT code ifeq ($(filter adp8064 fox,$(TARGET_DEVICE)),) - ifneq ($(filter msm8960 msm8x27 msm8974 msm8226,$(TARGET_BOARD_PLATFORM)),) + ifneq ($(filter msm8960 msm8x27 msm8226,$(TARGET_BOARD_PLATFORM)),) include $(call all-named-subdir-makefiles,msm8960) else ifneq ($(filter msm8994 msm8992 msm8996,$(TARGET_BOARD_PLATFORM)),) |