diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-07-23 00:41:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-23 00:41:10 +0000 |
| commit | aed3ac4c6bb550db63922831178d32468b4c6440 (patch) | |
| tree | 41b30c0ec70c212813b878d99d85cf3593afd8e1 | |
| parent | 378add113dc14d48729c5bc66a5870faf0414e14 (diff) | |
| parent | 99611dfb9ac7513ab39f569744439ee6c7568eba (diff) | |
| download | scrypt-aed3ac4c6bb550db63922831178d32468b4c6440.tar.gz | |
Merge \\\\"Rename lib{crypto,ssl}-host to lib{crypto,ssl}\\\\" am: 4b2bd9665c am: b442b13773 am: 32be729d37android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-release
am: 99611dfb9a
Change-Id: I6336d3574bef526024a7ce10cf4e736565d9dd51
| -rw-r--r-- | Scrypt.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -35,7 +35,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) include $(LOCAL_PATH)/android-config.mk -LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) libcrypto-host +LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) libcrypto LOCAL_SRC_FILES += $(host_src_files) LOCAL_CFLAGS += $(host_c_flags) LOCAL_C_INCLUDES += $(host_c_includes) |