Snap for 11472172 from e3cf23ab6a2fb249f629025dbae71b8642a2c668 to emu-34-2-release

Change-Id: I71b3aef511652117d2fcbc5b11c7966cdbc0452b

1 files changed, 24 insertions, 7 deletions

diff --git a/Android.bp b/Android.bp
index b20b802..f4b1d37 100644
--- a/Android.bp
+++ b/Android.bp
@@ -66,16 +66,20 @@ cc_defaults {
     shared_libs: ["libfdt"],
 
     stl: "none",
-    dist: {
-        targets: [
-            "dist_files",
-        ],
-        dir: "dtc",
+    target: {
+        host: {
+            dist: {
+                targets: [
+                    "dist_files",
+                ],
+                dir: "dtc",
+            },
+        },
     },
 }
 
-cc_binary_host {
-    name: "dtc",
+cc_defaults {
+    name: "dtc_defaults",
     defaults: ["dt_defaults"],
     srcs: [
         "checks.c",
@@ -92,6 +96,18 @@ cc_binary_host {
     ],
 }
 
+cc_binary {
+    name: "dtc_static",
+    defaults: ["dtc_defaults"],
+    static_executable: true,
+    installable: false, // test only
+}
+
+cc_binary_host {
+    name: "dtc",
+    defaults: ["dtc_defaults"],
+}
+
 cc_binary_host {
     name: "fdtget",
     defaults: ["dt_defaults"],
@@ -122,6 +138,7 @@ cc_binary_host {
 sh_binary_host {
     name: "dtdiff",
     src: "dtdiff",
+    required: ["dtc"],
 }
 
 genrule {