diff options
| author | Cole Faust <colefaust@google.com> | 2023-05-09 00:48:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-09 00:48:15 +0000 |
| commit | 31be4c730d7654bf6116e58f5221183d6227ae80 (patch) | |
| tree | 97cb617b2c6a0f7665a5e110c3f1d23a33090d00 | |
| parent | 1aa43263531a06caef740a97373eead33b2ac2f7 (diff) | |
| parent | 8035c23dc10559313f7f5e17aa022721f864226e (diff) | |
| download | vixl-31be4c730d7654bf6116e58f5221183d6227ae80.tar.gz | |
Remove usages of art_cc_defaults am: e9748ade07 am: 92f53b8394 am: 4b89cbf00e am: 8035c23dc1
Original change: https://android-review.googlesource.com/c/platform/external/vixl/+/2558096
Change-Id: I5f52cbc16dbe445ede94387214555cdd2771607b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 33 |
1 files changed, 26 insertions, 7 deletions
@@ -106,11 +106,23 @@ cc_defaults { }, } -art_cc_defaults { +cc_defaults { name: "vixl-arm", defaults: ["vixl-common"], - codegen: { - arm: { + target: { + host: { + srcs: ["src/aarch32/*.cc"], + cppflags: [ + "-DVIXL_INCLUDE_TARGET_T32", + ], + }, + android_arm: { + srcs: ["src/aarch32/*.cc"], + cppflags: [ + "-DVIXL_INCLUDE_TARGET_T32", + ], + }, + android_arm64: { srcs: ["src/aarch32/*.cc"], cppflags: [ "-DVIXL_INCLUDE_TARGET_T32", @@ -119,11 +131,18 @@ art_cc_defaults { }, } -art_cc_defaults { +cc_defaults { name: "vixl-arm64", defaults: ["vixl-common"], - codegen: { - arm64: { + target: { + host: { + srcs: ["src/aarch64/*.cc"], + cppflags: [ + "-DVIXL_INCLUDE_SIMULATOR_AARCH64", + "-DVIXL_INCLUDE_TARGET_A64", + ], + }, + android_arm64: { srcs: ["src/aarch64/*.cc"], cppflags: [ "-DVIXL_INCLUDE_SIMULATOR_AARCH64", @@ -234,7 +253,7 @@ cc_test_host { "test", ], exclude_srcs: [ - "test/test-donkey.cc" + "test/test-donkey.cc", ], srcs: [ "test/*.cc", |