diff options
author | Android Culprit Assistant <boq-android-culprit-assistant@system.gserviceaccount.com> | 2023-05-09 08:56:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-09 08:56:35 +0000 |
commit | a237cd6391365539e23161fd471f369e1602a58b (patch) | |
tree | f699330c2958363bba7dd027f7bba2c1b9de3a55 | |
parent | 2e1b54ae330614c31c7b7bbecd70480ca66ebaaf (diff) | |
parent | 99e47293ae5827472de65731d1b6aafe039ca42f (diff) | |
download | vixl-a237cd6391365539e23161fd471f369e1602a58b.tar.gz |
Revert "Remove usages of art_cc_defaults" am: f51439e103 am: 657e511eab am: d625d0728a am: a4e566bf80 am: 4208637674 am: 99e47293ae
Original change: https://android-review.googlesource.com/c/platform/external/vixl/+/2582359
Change-Id: Ib9cfa11afabbc0afb53cc9258aad4efc8e52071b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 33 |
1 files changed, 7 insertions, 26 deletions
@@ -106,23 +106,11 @@ cc_defaults { }, } -cc_defaults { +art_cc_defaults { name: "vixl-arm", defaults: ["vixl-common"], - target: { - host: { - srcs: ["src/aarch32/*.cc"], - cppflags: [ - "-DVIXL_INCLUDE_TARGET_T32", - ], - }, - android_arm: { - srcs: ["src/aarch32/*.cc"], - cppflags: [ - "-DVIXL_INCLUDE_TARGET_T32", - ], - }, - android_arm64: { + codegen: { + arm: { srcs: ["src/aarch32/*.cc"], cppflags: [ "-DVIXL_INCLUDE_TARGET_T32", @@ -131,18 +119,11 @@ cc_defaults { }, } -cc_defaults { +art_cc_defaults { name: "vixl-arm64", defaults: ["vixl-common"], - target: { - host: { - srcs: ["src/aarch64/*.cc"], - cppflags: [ - "-DVIXL_INCLUDE_SIMULATOR_AARCH64", - "-DVIXL_INCLUDE_TARGET_A64", - ], - }, - android_arm64: { + codegen: { + arm64: { srcs: ["src/aarch64/*.cc"], cppflags: [ "-DVIXL_INCLUDE_SIMULATOR_AARCH64", @@ -253,7 +234,7 @@ cc_test_host { "test", ], exclude_srcs: [ - "test/test-donkey.cc", + "test/test-donkey.cc" ], srcs: [ "test/*.cc", |