Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releasepie-gsi

am: b91992b549

Change-Id: I501d1b1e4adde425c0daff833f19efbefa9c7e06

2 files changed, 15 insertions, 1 deletions

diff --git a/arm-linux-androideabi/bin/as b/arm-linux-androideabi/bin/as
index 5378e97..3c8c5f1 120000..100755
--- a/arm-linux-androideabi/bin/as
+++ b/arm-linux-androideabi/bin/as
@@ -1 +1,14 @@
-../../bin/arm-linux-androideabi-as
\ No newline at end of file
+#! /usr/bin/python
+
+from sys import argv
+from subprocess import check_call
+
+if __name__ == '__main__':
+  for index, arg in enumerate(argv):
+    if arg == '-mcpu=cortex-a55':
+      argv[index] = '-mcpu=cortex-a53'
+    elif arg == '-mcpu=cortex-a75':
+      argv[index] = '-mcpu=cortex-a73'
+
+  argv[0] = argv[0] + '.real'
+  check_call(argv)
diff --git a/arm-linux-androideabi/bin/as.real b/arm-linux-androideabi/bin/as.real
new file mode 120000
index 0000000..5378e97
--- /dev/null
+++ b/arm-linux-androideabi/bin/as.real
@@ -0,0 +1 @@
+../../bin/arm-linux-androideabi-as
\ No newline at end of file