diff options
| author | Justin Yun <justinyun@google.com> | 2017-10-27 00:54:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-27 00:54:11 +0000 |
| commit | 4fffc7849d95170c4d9b33007a4859c949daf44e (patch) | |
| tree | d50d61e7ea67738b2e9fa203b94848e8f0da9989 | |
| parent | 55abed9b08565d0c72ab458f479c0f5746ad3a4e (diff) | |
| parent | c2685cb55acb621b32188ed0fe5346ac1e366ce6 (diff) | |
| download | common-4fffc7849d95170c4d9b33007a4859c949daf44e.tar.gz | |
Merge "Include generic for target device."
am: c2685cb55a
Change-Id: Ie125f099ae11ec8e643c9dea5d9d11b9dc4d0b68
| -rw-r--r-- | vndk/Android.mk | 4 | ||||
| -rw-r--r-- | vndk/vndk-sp-libs.mk | 1 |
2 files changed, 3 insertions, 2 deletions
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_MODULE_TAGS := optional LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES)) include $(BUILD_PHONY_PACKAGE) -endif # TARGET_DEVICE is generic_* +endif # TARGET_DEVICE is generic* 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 @@ VNDK_SP_LIBRARIES := \ libion \ liblzma \ libunwind \ + libunwindstack \ libutils \ libhidlbase \ libhidlmemory \ |