Skip to content

Commit 1ec18f3

Browse files
committed
Backport fix to external/lzma
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
1 parent 3d98847 commit 1ec18f3

File tree

1 file changed

+40
-0
lines changed

1 file changed

+40
-0
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From 2cf2a6c076670aa5a6846109706fc309f2ffc91f Mon Sep 17 00:00:00 2001
2+
From: Elliott Hughes <enh@google.com>
3+
Date: Thu, 5 Sep 2024 15:52:58 +0000
4+
Subject: [PATCH] Remove Android.bp -march hacks.
5+
6+
It looks like clang changed so that the __attribute__((__target__()))
7+
stuff is working again, and that's a lot safer than hard-coding -march.
8+
In particular, it turns out that we're still shipping ART mainline
9+
module updates to armv7 devices...
10+
11+
Bug: http://b/364822746
12+
Test: objdump
13+
Change-Id: If409deff5d08559a7466b6ebcd0aa95ea63a1665
14+
---
15+
Android.bp | 9 ---------
16+
1 file changed, 9 deletions(-)
17+
18+
diff --git a/Android.bp b/Android.bp
19+
index 752a8f9..828650c 100644
20+
--- a/Android.bp
21+
+++ b/Android.bp
22+
@@ -81,15 +81,6 @@ cc_library {
23+
"C/XzIn.c",
24+
],
25+
26+
- arch: {
27+
- arm: {
28+
- cflags: ["-march=armv8-a+crypto"],
29+
- },
30+
- arm64: {
31+
- cflags: ["-march=armv8-a+crypto"],
32+
- },
33+
- },
34+
-
35+
target: {
36+
linux_bionic: {
37+
enabled: true,
38+
--
39+
2.43.0
40+

0 commit comments

Comments
 (0)