diff options
author | Ying Wang <wangying@google.com> | 2014-12-16 20:42:14 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-16 20:42:15 +0000 |
commit | e0721529b9662b5ffb6cc7daf5b097720f5eb3e8 (patch) | |
tree | 61ea414ef9bc425dc2796fdeb31ac7e3843fc921 | |
parent | 21053fad6555b9e0063e263c729aae9beeae7e2b (diff) | |
parent | f8c692c36daa2fce3a0b1d0d04f41cd0d48d1122 (diff) | |
download | ml-master-soong.tar.gz |
Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-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_r1master-soongmarshmallow-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
-rw-r--r-- | bordeaux/learning/Android.mk | 1 | ||||
-rw-r--r-- | bordeaux/learning/multiclass_pa/Android.mk | 1 | ||||
-rw-r--r-- | bordeaux/learning/stochastic_linear_ranker/Android.mk | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/bordeaux/learning/Android.mk b/bordeaux/learning/Android.mk index e2e3bae5f..562a81def 100644 --- a/bordeaux/learning/Android.mk +++ b/bordeaux/learning/Android.mk @@ -25,7 +25,6 @@ LOCAL_MODULE := libbordeaux LOCAL_WHOLE_STATIC_LIBRARIES := libmulticlass_pa libstochastic_linear LOCAL_SHARED_LIBRARIES := libcutils liblog -LOCAL_PRELINK_MODULE := false LOCAL_C_INCLUDES += $(LOCAL_PATH)/../native diff --git a/bordeaux/learning/multiclass_pa/Android.mk b/bordeaux/learning/multiclass_pa/Android.mk index c9e57910d..c69f69158 100644 --- a/bordeaux/learning/multiclass_pa/Android.mk +++ b/bordeaux/learning/multiclass_pa/Android.mk @@ -27,7 +27,6 @@ LOCAL_MODULE := libmulticlass_pa LOCAL_SRC_FILES := native/multiclass_pa.cpp \ jni/jni_multiclass_pa.cpp -LOCAL_PRELINK_MODULE := false LOCAL_C_INCLUDES += $(LOCAL_PATH)/../native diff --git a/bordeaux/learning/stochastic_linear_ranker/Android.mk b/bordeaux/learning/stochastic_linear_ranker/Android.mk index 55ab5a49d..62f0fd3a0 100644 --- a/bordeaux/learning/stochastic_linear_ranker/Android.mk +++ b/bordeaux/learning/stochastic_linear_ranker/Android.mk @@ -28,7 +28,6 @@ LOCAL_SRC_FILES := native/stochastic_linear_ranker.cpp \ native/sparse_weight_vector.cpp \ jni/jni_stochastic_linear_ranker.cpp -LOCAL_PRELINK_MODULE := false LOCAL_C_INCLUDES += $(LOCAL_PATH)/../native |