Skip to content

Commit 9d2fed1

Browse files
committed
Use correct Android.mk constructs instead of abusing LOCAL_LDLIBS
1 parent f49d75a commit 9d2fed1

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

instruments/example/jni/Android.mk

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,16 @@
1515
LOCAL_PATH := $(call my-dir)
1616

1717
include $(CLEAR_VARS)
18+
LOCAL_MODULE := base
19+
LOCAL_SRC_FILES := ../../base/obj/local/armeabi/libbase.a
20+
LOCAL_EXPORT_C_INCLUDES := ../../base
21+
include $(PREBUILT_STATIC_LIBRARY)
1822

23+
24+
include $(CLEAR_VARS)
1925
LOCAL_MODULE := libexample
2026
LOCAL_SRC_FILES := ../epoll.c ../epoll_arm.c.arm
21-
LOCAL_LDLIBS := -L./libs -ldl -ldvm -lbase
22-
LOCAL_LDLIBS := -Wl,--start-group ../../base/obj/local/armeabi/libbase.a -Wl,--end-group
2327
LOCAL_CFLAGS := -g
24-
28+
LOCAL_SHARED_LIBRARIES := dl
29+
LOCAL_STATIC_LIBRARIES := base
2530
include $(BUILD_SHARED_LIBRARY)

0 commit comments

Comments
 (0)