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

Commit 60fdca22 authored by Iliyan Malchev's avatar Iliyan Malchev Committed by Android (Google) Code Review
Browse files

Merge "frameworks/base: remove LOCAL_PRELINK_MODULE"

parents ac1aa45e 3070af08

drm/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ LOCAL_C_INCLUDES += \ 
    $(TOP)/frameworks/base/drm/libdrmframework/plugins/common/include \

    $(TOP)/frameworks/base/include



LOCAL_PRELINK_MODULE := false





LOCAL_MODULE_TAGS := optional

drm/libdrmframework/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ LOCAL_C_INCLUDES += \ 
    $(TOP)/frameworks/base/drm/libdrmframework/include \

    $(TOP)/frameworks/base/include



LOCAL_PRELINK_MODULE := false





LOCAL_MODULE_TAGS := optional

drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libfwdlock-converter \

    libfwdlock-decoder



LOCAL_PRELINK_MODULE := false





LOCAL_C_INCLUDES += \

    $(JNI_H_INCLUDE) \

drm/libdrmframework/plugins/passthru/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ else 
 LOCAL_SHARED_LIBRARIES += libdl

endif



LOCAL_PRELINK_MODULE := false





LOCAL_C_INCLUDES += \

    $(TOP)/frameworks/base/drm/libdrmframework/include \

libs/hwui/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ ifeq ($(USE_OPENGL_RENDERER),true) 
	LOCAL_SHARED_LIBRARIES := libcutils libutils libGLESv2 libskia libui

	LOCAL_MODULE := libhwui

	LOCAL_MODULE_TAGS := optional

	LOCAL_PRELINK_MODULE := false

	

	include $(BUILD_SHARED_LIBRARY)