commit f868fd059e801924e252aa28aaab3fc404edac86
author Aaron Ding <aaronding@google.com> Wed Mar 27 01:35:47 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 27 01:35:47 2019 +0000
tree 79aa20ff1dfe203c989cbda9e024da360340329a
parent 78678718ce1c79d4d657ec44a88ff45bee5f05bc
parent 4877f197c711cea616118478b72fe43ec66a92fd

Merge changes from topic "LA.UM.8.1.C9.09.00.00.518.090-merge"

* changes:
  Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.090'
  Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.081'

os_pickup.mk

diff --git a/os_pickup.mk b/os_pickup.mk
index 939936e..7c4946e 100644
--- a/os_pickup.mk
+++ b/os_pickup.mk
@@ -1,4 +1,4 @@
-ifeq ($(TARGET_BOARD_PLATFORM),msmnile)
+ifeq ($(PRODUCT_PLATFORM),sm8150)
 LOCAL_PATH := $(call my-dir)
 include $(call first-makefiles-under,$(LOCAL_PATH))
 endif