aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlix <agespino@google.com>2022-05-16 18:23:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-16 18:23:50 +0000
commit0e8ce0ed54a11b340efbe6e6b37ebba1d99fb540 (patch)
treea1265f36e3804a721095a9cf30417e922de75b88
parentd0911058809dc914aebd64fd01b0b5f76fb171dd (diff)
parentbf4ac6c53d21a4fd82cdaf298e8e728a909b196b (diff)
downloadcapstone-0e8ce0ed54a11b340efbe6e6b37ebba1d99fb540.tar.gz
Deleted clang property in Android.bp files am: 0ee9ae4ef8 am: bf4ac6c53d
Original change: https://android-review.googlesource.com/c/platform/external/capstone/+/2065989 Change-Id: I4f2bc20224b522b1922600eee1023e83d001ed05 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