commit bf30b4fd92496cb0d66053ce777f29b4a07494b2
author Christopher Ferris <cferris@google.com> Fri Jun 19 23:46:53 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 19 23:46:55 2015 +0000
tree 9e2fdbb608b5a2a9797d9d45276d2d16f83224d1
parent 2fbe248c155a716d0345f683963aef7c95cc02b6
parent ad81791641071e8daab0d27e49731975c5efcba6

Merge "Add libwilhelm to app_process." into mnc-dev

cmds/app_process/Android.mk

diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk
index 3599695..7ce0846 100644
--- a/cmds/app_process/Android.mk
+++ b/cmds/app_process/Android.mk
@@ -1,5 +1,12 @@
 LOCAL_PATH:= $(call my-dir)
 
+# This is a list of libraries that need to be included in order to avoid
+# bad apps. This prevents a library from having a mismatch when resolving
+# new/delete from an app shared library.
+# See b/21032018 for more details.
+app_process_common_shared_libs := \
+    libwilhelm \
+
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
@@ -13,7 +20,8 @@
     libutils \
     liblog \
     libbinder \
-    libandroid_runtime
+    libandroid_runtime \
+    $(app_process_common_shared_libs) \
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain
 
@@ -44,7 +52,8 @@
     libutils \
     liblog \
     libbinder \
-    libandroid_runtime
+    libandroid_runtime \
+    $(app_process_common_shared_libs) \
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain