aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlix <agespino@google.com>2022-05-16 20:54:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-16 20:54:34 +0000
commit19b8918e33b948c841f36bf035b08a31e2db8ba1 (patch)
treea1265f36e3804a721095a9cf30417e922de75b88
parent7753913e775793ebc0627b731a179955955e2132 (diff)
parent1607e845d587bede4379a1d7f86e98abdc99c23c (diff)
downloadcapstone-19b8918e33b948c841f36bf035b08a31e2db8ba1.tar.gz
Deleted clang property in Android.bp files am: 0ee9ae4ef8 am: bf4ac6c53d am: 0e8ce0ed54 am: 91c8b197b4 am: 1607e845d5
Original change: https://android-review.googlesource.com/c/platform/external/capstone/+/2065989 Change-Id: I84feb577f0317cd8a6eb81948829fe65c650f622 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp16
1 files changed, 9 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index 2c54b0cf..3ef1ae79 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,3 @@
-
package {
default_applicable_licenses: ["external_capstone_license"],
}
@@ -82,8 +81,11 @@ cc_defaults {
"-Wno-missing-field-initializers",
"-DCAPSTONE_USE_SYS_DYN_MEM",
],
- export_include_dirs: [".", "include"],
- clang: true,
+ export_include_dirs: [
+ ".",
+ "include",
+ ],
+
arch: {
arm: {
cflags: arm_flags,
@@ -93,15 +95,15 @@ cc_defaults {
cflags: arm_flags + arm64_flags + x86_flags,
srcs: arm_srcs + arm64_srcs + x86_srcs,
},
- x86_64: {
+ x86_64: {
cflags: arm_flags + arm64_flags + x86_flags,
srcs: arm_srcs + arm64_srcs + x86_srcs,
},
arm64: {
cflags: arm_flags + arm64_flags,
- srcs: arm_srcs + arm64_srcs
- }
- }
+ srcs: arm_srcs + arm64_srcs,
+ },
+ },
}
// For the host and device platform