remove .gce_x86 suffix from ssh output files (post_install_cmd is not supported in jb-mr1 and before).android-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_r1marshmallow-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

Change-Id: I187386c699f22d80bac4c7f8c1e12ee5a590fb55
(cherry picked from commit 0c94e12da1d82c05a136cb5a0ed71dfe0f8a1b0c)

1 files changed, 13 insertions, 19 deletions

diff --git a/Android.mk b/Android.mk
index db1fe3836..c332f4794 100644
--- a/Android.mk
+++ b/Android.mk
@@ -120,7 +120,7 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_SHARED_LIBRARIES += libssl libcrypto libdl libz
 
-LOCAL_MODULE := libssh.gce
+LOCAL_MODULE := libssh
 
 LOCAL_CFLAGS+=-O3 -Wno-unused-parameter
 
@@ -137,8 +137,7 @@ LOCAL_SRC_FILES := \
     sshconnect.c sshconnect1.c sshconnect2.c mux.c \
     roaming_common.c roaming_client.c
 
-LOCAL_MODULE := ssh.gce
-LOCAL_POST_INSTALL_CMD := $(hide) ln -sf ssh.gce $(TARGET_OUT)/bin/ssh
+LOCAL_MODULE := ssh
 
 
 LOCAL_CFLAGS += -Wno-unused-parameter
@@ -148,7 +147,7 @@ LOCAL_C_INCLUDES := \
     external/openssl/include \
     external/openssh/openbsd-compat
 
-LOCAL_SHARED_LIBRARIES += libssh.gce libssl libcrypto libdl libz
+LOCAL_SHARED_LIBRARIES += libssh libssl libcrypto libdl libz
 
 include $(BUILD_EXECUTABLE)
 
@@ -161,8 +160,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
 
-LOCAL_MODULE := sftp.gce
-LOCAL_POST_INSTALL_CMD := $(hide) ln -sf sftp.gce $(TARGET_OUT)/bin/sftp
+LOCAL_MODULE := sftp
 
 LOCAL_CFLAGS += -Wno-unused-parameter
 
@@ -171,7 +169,7 @@ LOCAL_C_INCLUDES := \
     external/openssl/include \
     external/openssh/openbsd-compat
 
-LOCAL_SHARED_LIBRARIES += libssh.gce libssl libcrypto libdl libz
+LOCAL_SHARED_LIBRARIES += libssh libssl libcrypto libdl libz
 
 include $(BUILD_EXECUTABLE)
 
@@ -184,8 +182,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     scp.c progressmeter.c
 
-LOCAL_MODULE := scp.gce
-LOCAL_POST_INSTALL_CMD := $(hide) ln -sf scp.gce $(TARGET_OUT)/bin/scp
+LOCAL_MODULE := scp
 
 LOCAL_CFLAGS += -Wno-unused-parameter
 
@@ -194,7 +191,7 @@ LOCAL_C_INCLUDES := \
     external/openssl/include \
     external/openssh/openbsd-compat
 
-LOCAL_SHARED_LIBRARIES += libssh.gce libssl libcrypto libdl libz
+LOCAL_SHARED_LIBRARIES += libssh libssl libcrypto libdl libz
 
 include $(BUILD_EXECUTABLE)
 
@@ -256,8 +253,7 @@ LOCAL_SRC_FILES := \
     sshlogin.c \
     sshpty.c
 
-LOCAL_MODULE := sshd.gce
-LOCAL_POST_INSTALL_CMD := $(hide) ln -sf sshd.gce $(TARGET_OUT)/bin/sshd
+LOCAL_MODULE := sshd
 
 LOCAL_CFLAGS += -Wno-unused-parameter
 
@@ -266,7 +262,7 @@ LOCAL_C_INCLUDES := \
     external/openssl/include \
     external/openssh/openbsd-compat
 
-LOCAL_SHARED_LIBRARIES += libssh.gce libssl libcrypto libdl libz libcutils
+LOCAL_SHARED_LIBRARIES += libssh libssl libcrypto libdl libz libcutils
 
 include $(BUILD_EXECUTABLE)
 
@@ -279,8 +275,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     ssh-keygen.c
 
-LOCAL_MODULE := ssh-keygen.gce
-LOCAL_POST_INSTALL_CMD := $(hide) ln -sf ssh-keygen.gce $(TARGET_OUT)/bin/ssh-keygen
+LOCAL_MODULE := ssh-keygen
 
 LOCAL_CFLAGS += -Wno-unused-parameter
 
@@ -289,7 +284,7 @@ LOCAL_C_INCLUDES := \
     external/openssl/include \
     external/openssh/openbsd-compat
 
-LOCAL_SHARED_LIBRARIES += libssh.gce libssl libcrypto libdl libz
+LOCAL_SHARED_LIBRARIES += libssh libssl libcrypto libdl libz
 
 include $(BUILD_EXECUTABLE)
 
@@ -297,7 +292,7 @@ include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := sshd_config.gce
+LOCAL_MODULE := sshd_config
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/ssh
 LOCAL_SRC_FILES := sshd_config.android
@@ -307,8 +302,7 @@ include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := start-ssh.gce
-LOCAL_POST_INSTALL_CMD := $(hide) ln -sf start-ssh.gce $(TARGET_OUT)/bin/start-ssh
+LOCAL_MODULE := start-ssh
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_SRC_FILES := start-ssh
 include $(BUILD_PREBUILT)