Revert "Remove usages of art_cc_defaults" am: f51439e103 am: 657e511eab

Original change: https://android-review.googlesource.com/c/platform/external/vixl/+/2582359

Change-Id: I5b3dc53305885f1316dd70021b7040931a822213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 7 insertions, 26 deletions

diff --git a/Android.bp b/Android.bp
index f497cf2a..eeaf1520 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",