summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriff Hazen <griff@google.com>2014-02-13 18:03:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-13 18:03:25 +0000
commita18a4ce64ccf29e6ca2f83b3b658d745175dfd0e (patch)
tree4c8662512455e0b50a546b7272fb5c9caaa53068
parent5163fe462e02abef040d97dd351aa98cead9b1a2 (diff)
parent3232474650c76f6877a68fd2097ee409ac5b4136 (diff)
downloadinvensense-a18a4ce64ccf29e6ca2f83b3b658d745175dfd0e.tar.gz
am 32324746: am 77b0e981: Match dory/platina/guppy device instead of product.
* commit '3232474650c76f6877a68fd2097ee409ac5b4136': Match dory/platina/guppy device instead of product.
-rw-r--r--6515/libsensors_iio/Android.mk2
-rw-r--r--Android.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/6515/libsensors_iio/Android.mk b/6515/libsensors_iio/Android.mk
index f78a8bd..6d9e1ce 100644
--- a/6515/libsensors_iio/Android.mk
+++ b/6515/libsensors_iio/Android.mk
@@ -93,7 +93,7 @@ else
ifneq ($(filter aosp_hammerhead, $(TARGET_PRODUCT)),)
LOCAL_MODULE := sensors.hammerhead
endif
-ifneq ($(filter platina dory guppy, $(TARGET_PRODUCT)),)
+ifneq ($(filter dory guppy, $(TARGET_DEVICE)),)
LOCAL_MODULE := sensors.invensense
endif
endif
diff --git a/Android.mk b/Android.mk
index a7f04b2..802eeb1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,8 +3,8 @@ ifneq ($(filter hammerhead, $(TARGET_DEVICE)),)
# hammerhead expects 65xx sensors.
include $(call all-named-subdir-makefiles,65xx)
else
-ifneq ($(filter guppy dory platina, $(TARGET_DEVICE)),)
-# dory, guppy, and platina expect 6515 sensors.
+ifneq ($(filter guppy dory, $(TARGET_DEVICE)),)
+# dory and guppy expect 6515 sensors.
include $(call all-named-subdir-makefiles,6515)
else
# manta expects 60xx sensors.