Merge "./update-makefiles.sh, for union changes/memory" am: 00daede4d5

am: 0942e33017

Change-Id: I9892fbefe4af535f7576e4b8ecb49abe8259bbb9

audio/common/6.0/Android.bp

@@ -12,6 +12,6 @@ hidl_interface {
     interfaces: [
         "android.hidl.safe_union@1.0",
     ],
-    gen_java: false,
+    gen_java: true,
     gen_java_constants: true,
 }

cas/1.2/Android.bp

@@ -7,10 +7,10 @@ hidl_interface {
         enabled: true,
     },
     srcs: [
+        "types.hal",
         "ICas.hal",
         "ICasListener.hal",
         "IMediaCasService.hal",
-        "types.hal",
     ],
     interfaces: [
         "android.hardware.cas@1.0",

drm/1.0/Android.bp

@@ -17,5 +17,5 @@ hidl_interface {
     interfaces: [
         "android.hidl.base@1.0",
     ],
-    gen_java: false,
+    gen_java: true,
 }

keymaster/4.1/Android.bp

@@ -12,6 +12,7 @@ hidl_interface {
         "IOperation.hal",
     ],
     interfaces: [
+        "android.hardware.keymaster@3.0",
         "android.hardware.keymaster@4.0",
         "android.hidl.base@1.0",
     ],

radio/1.5/Android.bp

@@ -19,6 +19,7 @@ hidl_interface {
         "android.hardware.radio@1.3",
         "android.hardware.radio@1.4",
         "android.hidl.base@1.0",
+        "android.hidl.safe_union@1.0",
     ],
     gen_java: true,
 }

soundtrigger/2.1/Android.bp

@@ -15,5 +15,5 @@ hidl_interface {
         "android.hardware.soundtrigger@2.0",
         "android.hidl.base@1.0",
     ],
-    gen_java: false,
+    gen_java: true,
 }

soundtrigger/2.2/Android.bp

@@ -15,5 +15,5 @@ hidl_interface {
         "android.hardware.soundtrigger@2.1",
         "android.hidl.base@1.0",
     ],
-    gen_java: false,
+    gen_java: true,
 }

tests/memory/1.0/Android.bp

@@ -11,5 +11,5 @@ hidl_interface {
         "android.hidl.memory.block@1.0",
         "android.hidl.memory.token@1.0",
     ],
-    gen_java: false,
+    gen_java: true,
 }

tests/memory/2.0/Android.bp

@@ -1,9 +1,11 @@
+// This file is autogenerated by hidl-gen -Landroidbp.
+
 hidl_interface {
     name: "android.hardware.tests.memory@2.0",
     root: "android.hardware",
     srcs: [
-        "IMemoryInterface.hal",
         "types.hal",
+        "IMemoryInterface.hal",
     ],
     interfaces: [
         "android.hidl.base@1.0",