commit 8350c4c540b6ad8a5e5ea01b6aacb9e92fa3d7dc
author Orion Hodson <oth@google.com> Tue Oct 31 17:40:19 2017 +0000
committer Orion Hodson <oth@google.com> Tue Oct 31 17:41:16 2017 +0000
tree cf9ab7b354452c99637e39af8ecf2b05a8df4b34
parent d75168135a24970f58273c1da6b395f56e3290a9

Revert "CFI compatibility with static executables and nested archives"

This reverts commit 3d3e1cf26002ce91a47351cd456dfe680a32b8fe.

Rationale: part of a group of commits that left aosp_x86_64 not
building. (See https://android-build.googleplex.com/builds/
submitted/4426589/aosp_x86_64-eng/latest/logs/build_error.log)

Bug: 30227045
Test: builds
Change-Id: Ie22590abe3d1cdccb8d141baf6480d49dedf8789

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index a8644d6..b988d1e 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1556,7 +1556,7 @@
         filelist="$$filelist $$ldir/$$ext$$f"; \
     done ; \
     $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \
-        $(PRIVATE_ARFLAGS) $(2) $$filelist
+        $(2) $$filelist
 
 endef