commit bc2e88a85d5fd3e59c041a667283378c1503a16c
author Dimitry Ivanov <dimitry@google.com> Wed Dec 16 19:02:04 2015 +0000
committer Dimitry Ivanov <dimitry@google.com> Wed Dec 16 19:02:04 2015 +0000
tree 4c2f4295e7c36a46c22a0984366ce8e12c5be93f
parent 23af25b747b5e7b0ca513a87b32f1f6a3cb99698

Revert "Revert "Remove remaining ndk_cruft from LP64 platforms""

This reverts commit 23af25b747b5e7b0ca513a87b32f1f6a3cb99698.

Bug: http://b/26164862
Change-Id: I201bf49530f33f8ba6a1a35b79723afb9e84c7a5

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 20442f7..a399b89 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1387,11 +1387,8 @@
     $(LOCAL_PATH)/libc.x86.map \
     $(LOCAL_PATH)/libc.x86_64.map \
     $(LOCAL_PATH)/libc.arm.brillo.map \
-    $(LOCAL_PATH)/libc.arm64.brillo.map \
     $(LOCAL_PATH)/libc.mips.brillo.map \
-    $(LOCAL_PATH)/libc.mips64.brillo.map \
     $(LOCAL_PATH)/libc.x86.brillo.map \
-    $(LOCAL_PATH)/libc.x86_64.brillo.map \
 
 # Leave the symbols in the shared library so that stack unwinders can produce
 # meaningful name resolution.
@@ -1427,17 +1424,15 @@
 LOCAL_LDFLAGS_arm    += -Wl,--version-script,$(LOCAL_PATH)/libc.arm.brillo.map
 LOCAL_LDFLAGS_mips   += -Wl,--version-script,$(LOCAL_PATH)/libc.mips.brillo.map
 LOCAL_LDFLAGS_x86    += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.brillo.map
-LOCAL_LDFLAGS_arm64  += -Wl,--version-script,$(LOCAL_PATH)/libc.arm64.brillo.map
-LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.brillo.map
-LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.brillo.map
 else
 LOCAL_LDFLAGS_arm    += -Wl,--version-script,$(LOCAL_PATH)/libc.arm.map
 LOCAL_LDFLAGS_mips   += -Wl,--version-script,$(LOCAL_PATH)/libc.mips.map
 LOCAL_LDFLAGS_x86    += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.map
+endif
+
 LOCAL_LDFLAGS_arm64  += -Wl,--version-script,$(LOCAL_PATH)/libc.arm64.map
 LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.map
 LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.map
-endif
 
 # We'd really like to do this for all architectures, but since this wasn't done
 # before, these symbols must continue to be exported on LP32 for binary