diff options
| author | Android Culprit Assistant <boq-android-culprit-assistant@system.gserviceaccount.com> | 2023-05-08 21:15:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-08 21:15:26 +0000 |
| commit | 657e511eabd9247f38e4c3fae45a0b2f1133f15a (patch) | |
| tree | f699330c2958363bba7dd027f7bba2c1b9de3a55 | |
| parent | 92f53b839453ca3de91335c185175f8379e4ae66 (diff) | |
| parent | f51439e1037bd96cc2e68706ebf6611e2b2c8ae6 (diff) | |
| download | vixl-657e511eabd9247f38e4c3fae45a0b2f1133f15a.tar.gz | |
Revert "Remove usages of art_cc_defaults" am: f51439e103
Original change: https://android-review.googlesource.com/c/platform/external/vixl/+/2582359
Change-Id: I3476af3fad6121c5b88581bef7b2f7d37f7d97af
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", |