get rid of android and androidkernel triples
Now that we've reverted the kernel commit:
("ANDROID: Kbuild, LLVMLinux: allow overriding clang target triple")
in:
- aosp/1492141
- aosp/1494224
- aosp/1494616
we no longer need such triples.
After this, we're left with just:
aarch64-linux-gnu-as
aarch64-linux-gnu-elfedit
arm-linux-gnueabi-as
arm-linux-gnueabi-elfedit
x86_64-linux-gnu-as
x86_64-linux-gnu-elfedit
As part of
https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/BINUTILS_KERNEL_DEPRECATION.md
should we ever need to revert LLVM_IAS=1 kernel changes (see Contigency
Plans section in above link), then these are the few binaries we will
fall back on.
Bug: 141693040
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Change-Id: I05455520ae5890e09f0b12f16cafaaef64de3592
diff --git a/aarch64-linux-androidkernel-as b/aarch64-linux-androidkernel-as
deleted file mode 120000
index 73b56dd..0000000
--- a/aarch64-linux-androidkernel-as
+++ /dev/null
@@ -1 +0,0 @@
-aarch64-linux-android-as
\ No newline at end of file
diff --git a/aarch64-linux-androidkernel-elfedit b/aarch64-linux-androidkernel-elfedit
deleted file mode 100755
index e69de29..0000000
--- a/aarch64-linux-androidkernel-elfedit
+++ /dev/null
diff --git a/aarch64-linux-gnu-as b/aarch64-linux-gnu-as
deleted file mode 120000
index 73b56dd..0000000
--- a/aarch64-linux-gnu-as
+++ /dev/null
@@ -1 +0,0 @@
-aarch64-linux-android-as
\ No newline at end of file
diff --git a/aarch64-linux-android-as b/aarch64-linux-gnu-as
similarity index 100%
rename from aarch64-linux-android-as
rename to aarch64-linux-gnu-as
Binary files differ
diff --git a/aarch64-linux-gnu-elfedit b/aarch64-linux-gnu-elfedit
deleted file mode 120000
index e045589..0000000
--- a/aarch64-linux-gnu-elfedit
+++ /dev/null
@@ -1 +0,0 @@
-aarch64-linux-androidkernel-elfedit
\ No newline at end of file
diff --git a/arm-linux-androidkernel-elfedit b/aarch64-linux-gnu-elfedit
similarity index 100%
rename from arm-linux-androidkernel-elfedit
rename to aarch64-linux-gnu-elfedit
diff --git a/arm-linux-androidkernel-as b/arm-linux-androidkernel-as
deleted file mode 120000
index 0d3f702..0000000
--- a/arm-linux-androidkernel-as
+++ /dev/null
@@ -1 +0,0 @@
-arm-linux-androideabi-as
\ No newline at end of file
diff --git a/arm-linux-gnueabi-as b/arm-linux-gnueabi-as
deleted file mode 120000
index 0d3f702..0000000
--- a/arm-linux-gnueabi-as
+++ /dev/null
@@ -1 +0,0 @@
-arm-linux-androideabi-as
\ No newline at end of file
diff --git a/arm-linux-androideabi-as b/arm-linux-gnueabi-as
similarity index 100%
rename from arm-linux-androideabi-as
rename to arm-linux-gnueabi-as
Binary files differ
diff --git a/arm-linux-gnueabi-elfedit b/arm-linux-gnueabi-elfedit
deleted file mode 120000
index d7639aa..0000000
--- a/arm-linux-gnueabi-elfedit
+++ /dev/null
@@ -1 +0,0 @@
-arm-linux-androidkernel-elfedit
\ No newline at end of file
diff --git a/arm-linux-androidkernel-elfedit b/arm-linux-gnueabi-elfedit
similarity index 100%
copy from arm-linux-androidkernel-elfedit
copy to arm-linux-gnueabi-elfedit
diff --git a/x86_64-linux-androidkernel-as b/x86_64-linux-androidkernel-as
deleted file mode 120000
index dfba2d8..0000000
--- a/x86_64-linux-androidkernel-as
+++ /dev/null
@@ -1 +0,0 @@
-x86_64-linux-android-as
\ No newline at end of file
diff --git a/x86_64-linux-androidkernel-elfedit b/x86_64-linux-androidkernel-elfedit
deleted file mode 100755
index e69de29..0000000
--- a/x86_64-linux-androidkernel-elfedit
+++ /dev/null
diff --git a/x86_64-linux-gnu-as b/x86_64-linux-gnu-as
deleted file mode 120000
index dfba2d8..0000000
--- a/x86_64-linux-gnu-as
+++ /dev/null
@@ -1 +0,0 @@
-x86_64-linux-android-as
\ No newline at end of file
diff --git a/x86_64-linux-android-as b/x86_64-linux-gnu-as
similarity index 100%
rename from x86_64-linux-android-as
rename to x86_64-linux-gnu-as
Binary files differ
diff --git a/x86_64-linux-gnu-elfedit b/x86_64-linux-gnu-elfedit
deleted file mode 120000
index ccfea05..0000000
--- a/x86_64-linux-gnu-elfedit
+++ /dev/null
@@ -1 +0,0 @@
-x86_64-linux-androidkernel-elfedit
\ No newline at end of file
diff --git a/arm-linux-androidkernel-elfedit b/x86_64-linux-gnu-elfedit
similarity index 100%
copy from arm-linux-androidkernel-elfedit
copy to x86_64-linux-gnu-elfedit
