Snap for 10453563 from 185de3061a4078831bc8368cfc6ef8346907054e to mainline-sdkext-release

Change-Id: I4901f56a9cfa7c547ea07ea70033cbc2dbe8cbca

Android.bp

diff --git a/Android.bp b/Android.bp
index e081b51..c9a87d1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -388,14 +388,6 @@
     owner: "intel",
 
     srcs: [":EddParser.py-srcs"],
-    version: {
-        py2: {
-            enabled: false,
-        },
-        py3: {
-            enabled: true,
-        },
-    },
 }
 
 filegroup {
@@ -410,14 +402,6 @@
     owner: "intel",
 
     srcs: [":PfwBaseTranslator.py-srcs"],
-    version: {
-        py2: {
-            enabled: false,
-        },
-        py3: {
-            enabled: true,
-        },
-    },
 }
 
 filegroup {
@@ -436,14 +420,6 @@
         "PfwBaseTranslator.py",
         "EddParser.py",
     ],
-    version: {
-        py2: {
-            enabled: false,
-        },
-        py3: {
-            enabled: true,
-        },
-    },
 }
 
 sh_binary {
@@ -466,14 +442,6 @@
     owner: "intel",
 
     srcs: [":hostConfig.py-srcs"],
-    version: {
-        py2: {
-            enabled: false,
-        },
-        py3: {
-            enabled: true,
-        },
-    },
 }
 
 python_binary_host {
@@ -488,35 +456,25 @@
         "hostConfig.py",
         "PFWScriptGenerator.py",
     ],
-    version: {
-        py2: {
-            enabled: false,
-        },
-        py3: {
-            enabled: true,
-        },
-    },
     required: [
         "domainGeneratorConnector",
     ],
 }
 
-cc_prebuilt_binary {
+sh_binary {
     name: "domainGenerator.sh",
-    defaults: ["pfw_defaults"],
     owner: "intel",
 
     host_supported: true,
-    srcs: ["upstream/tools/xmlGenerator/domainGenerator.sh"],
+    src: "upstream/tools/xmlGenerator/domainGenerator.sh",
 }
 
-cc_prebuilt_binary {
+sh_binary {
     name: "lightRoutingUpdate.sh",
-    defaults: ["pfw_defaults"],
     owner: "intel",
 
     host_supported: true,
-    srcs: ["upstream/tools/xmlGenerator/lightRoutingUpdate.sh"],
+    src: "upstream/tools/xmlGenerator/lightRoutingUpdate.sh",
 }
 
 //////////////////////////////////////////////////