Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9f60741 authored by Christopher Ferris's avatar Christopher Ferris Committed by Android Git Automerger
Browse files

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

* commit 'bf30b4fd':
  Add libwilhelm to app_process.
parents 3adcfab7 bf30b4fd

cmds/app_process/Android.mk

+11 −2
Original line number Original line Diff line number Diff line 
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