Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bf30b4fd: Merge "Add libwilhelm to app_process." into mnc-dev

Browse Source 
* commit 'bf30b4fd92496cb0d66053ce777f29b4a07494b2':
  Add libwilhelm to app_process.
This commit is contained in:
Christopher Ferris
2015-06-19 23:57:15 +00:00
committed by Android Git Automerger
parent 3adcfab7e9 bf30b4fd92
commit d9f6074172
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmds/app_process/Android.mk
View File

@@ -1,5 +1,12 @@
LOCAL_PATH:= $(call my-dir) 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) include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
@@ -13,7 +20,8 @@ LOCAL_SHARED_LIBRARIES := \
libutils \ libutils \
liblog \ liblog \
libbinder \ libbinder \
libandroid_runtime libandroid_runtime \
$(app_process_common_shared_libs) \
LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain
@@ -44,7 +52,8 @@ LOCAL_SHARED_LIBRARIES := \
libutils \ libutils \
liblog \ liblog \
libbinder \ libbinder \
libandroid_runtime libandroid_runtime \
$(app_process_common_shared_libs) \
LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain