diff options
author | Adam Langley <agl@google.com> | 2015-04-01 11:18:47 -0700 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-04-01 11:21:08 -0700 |
commit | 54fc82147d8ea715bf2864246453d325bf546608 (patch) | |
tree | c06e4df2b8af84db189288ee7461a0236b09ac9d /Android.mk | |
parent | 56754d116e706df26c67b541e20cd1cf8b2ebd66 (diff) | |
download | libvncserver-54fc82147d8ea715bf2864246453d325bf546608.tar.gz |
external/libvncserver: use library references where possible.android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1nougat-mr1-wear-releasen-iot-preview-2marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-release
By referencing libraries rather than include paths directly, a build
becomes resilient when those libraries are moved around. In this case,
external/openssl is planned to do that soon, so this change will prevent
libvncserver from breaking when that happens.
Change-Id: I2161f661de52b49eb20f27eef87bb27316b941bd
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -7,13 +7,8 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/include \ $(LOCAL_PATH)/libvncserver \ $(LOCAL_PATH) \ $(LOCAL_PATH)/common \ - external/zlib \ - external/libpng \ - external/openssl/include \ external/jpeg -common_static_libraries := libz libpng libjpeg_static libssl_static - LOCAL_SRC_FILES := libvncserver/auth.c \ libvncserver/cargs.c \ libvncserver/corre.c \ @@ -46,9 +41,9 @@ LOCAL_SRC_FILES := libvncserver/auth.c \ common/sha1.c \ common/turbojpeg.c \ common/vncauth.c \ - test/bmp.c + test/bmp.c -LOCAL_STATIC_LIBRARIES := +LOCAL_STATIC_LIBRARIES := libz libpng libjpeg_static libssl_static LOCAL_CFLAGS := -D__ANDROID__ -DHAVE_LIBSSL -DWITH_WEBSOCKETS #LOCAL_SDK_VERSION := 14 |