commit d7a1ee46958ea2b87ec2fd0b9e08aa88d70d9b71
author Justin Yun <justinyun@google.com> Thu Sep 28 13:43:15 2017 +0900
committer Justin Yun <justinyun@google.com> Thu Oct 19 14:32:23 2017 +0900
tree 1c5d070f642a40b0d0887fcf09d14c0c8e4632a2
parent 60496be1c17ad72847ed90bca4abcd6ede5bf4a8

Remove all copies of vndk-sp modules

With BOARD_VNDK_VERSION=current, the vendor variant of vndk-sp will
be installed to system/lib(64)/vndk-sp by build system if they have
"vndk: { enabled: true, support_system_process: true }" in their
Android.bp files.

Skip generating the copies of vndk-sp modules when BOARD_VNDK_VERSION
is defined.

Bug: 65853349
Test: build emulator
Change-Id: Ib81bf1a614dc6c3e5eb8bb6adbc0745f16124bdc
Merged-In: I3a46c338f204379604c27ff99f2e1e11a81363ba

vndk/Android.mk

diff --git a/vndk/Android.mk b/vndk/Android.mk
index a58aac5..6c5a956 100644
--- a/vndk/Android.mk
+++ b/vndk/Android.mk
@@ -2,6 +2,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
+ifndef BOARD_VNDK_VERSION
 VNDK_SP_LIBRARIES := \
     android.hardware.renderscript@1.0\
     android.hardware.graphics.allocator@2.0\
@@ -26,7 +27,8 @@
     libbacktrace\
     libunwind\
     libunwindstack\
-    liblzma\
+    liblzma
+endif
 
 define add-vndk-sp-lib
 include $$(CLEAR_VARS)