commit 095d3e4c74e16140cf5a00691bc7b2c3db414674
author Justin Yun <justinyun@google.com> Fri Oct 20 19:04:56 2017 +0900
committer Justin Yun <justinyun@google.com> Thu Oct 26 19:40:54 2017 +0900
tree d50d61e7ea67738b2e9fa203b94848e8f0da9989
parent 55abed9b08565d0c72ab458f479c0f5746ad3a4e

Include generic for target device.

This should inlcude generic target as well as generic_% targets.

Bug: 68291946
Test: lunch generic-user; make
Change-Id: If026431d16842c323b4cd726435af5f13f3bbf23

vndk/Android.mk

diff --git a/vndk/Android.mk b/vndk/Android.mk
index 4ef78ba..2143431 100644
--- a/vndk/Android.mk
+++ b/vndk/Android.mk
@@ -1,4 +1,4 @@
-ifneq ($(filter generic_%,$(TARGET_DEVICE)),)
+ifneq ($(filter generic%,$(TARGET_DEVICE)),)
 
 LOCAL_PATH := $(call my-dir)
 
@@ -44,4 +44,4 @@
 LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES))
 include $(BUILD_PHONY_PACKAGE)
 
-endif # TARGET_DEVICE is generic_*
+endif # TARGET_DEVICE is generic*

vndk/vndk-sp-libs.mk

diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk
index e7d5ea3..962565a 100644
--- a/vndk/vndk-sp-libs.mk
+++ b/vndk/vndk-sp-libs.mk
@@ -22,6 +22,7 @@
     libion \
     liblzma \
     libunwind \
+    libunwindstack \
     libutils \
     libhidlbase \
     libhidlmemory \