Update makefiles.

Test: mmma hardware/interfaces
Change-Id: I501524fa3fbbaed9b71e5b9c3bbc8aa3c8c25896

3 files changed, 12 insertions, 120 deletions

diff --git a/renderscript/1.0/Android.bp b/renderscript/1.0/Android.bp
index 5ae70274b..cce34e7e6 100644
--- a/renderscript/1.0/Android.bp
+++ b/renderscript/1.0/Android.bp
@@ -1,13 +1,20 @@
 // This file is autogenerated by hidl-gen. Do not edit manually.
 
+filegroup {
+    name: "android.hardware.renderscript@1.0_hal",
+    srcs: [
+        "types.hal",
+        "IContext.hal",
+        "IDevice.hal",
+    ],
+}
+
 genrule {
     name: "android.hardware.renderscript@1.0_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0",
     srcs: [
-        "types.hal",
-        "IContext.hal",
-        "IDevice.hal",
+        ":android.hardware.renderscript@1.0_hal",
     ],
     out: [
         "android/hardware/renderscript/1.0/types.cpp",
@@ -21,9 +28,7 @@ genrule {
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0",
     srcs: [
-        "types.hal",
-        "IContext.hal",
-        "IDevice.hal",
+        ":android.hardware.renderscript@1.0_hal",
     ],
     out: [
         "android/hardware/renderscript/1.0/types.h",
@@ -62,114 +67,3 @@ cc_library_shared {
         "android.hidl.base@1.0",
     ],
 }
-
-genrule {
-    name: "android.hardware.renderscript.vts.driver@1.0_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
-    srcs: [
-        "types.hal",
-        "IContext.hal",
-        "IDevice.hal",
-    ],
-    out: [
-        "android/hardware/renderscript/1.0/types.vts.cpp",
-        "android/hardware/renderscript/1.0/Context.vts.cpp",
-        "android/hardware/renderscript/1.0/Device.vts.cpp",
-    ],
-}
-
-genrule {
-    name: "android.hardware.renderscript.vts.driver@1.0_genc++_headers",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
-    srcs: [
-        "types.hal",
-        "IContext.hal",
-        "IDevice.hal",
-    ],
-    out: [
-        "android/hardware/renderscript/1.0/types.vts.h",
-        "android/hardware/renderscript/1.0/Context.vts.h",
-        "android/hardware/renderscript/1.0/Device.vts.h",
-    ],
-}
-
-cc_library_shared {
-    name: "android.hardware.renderscript.vts.driver@1.0",
-    generated_sources: ["android.hardware.renderscript.vts.driver@1.0_genc++"],
-    generated_headers: ["android.hardware.renderscript.vts.driver@1.0_genc++_headers"],
-    export_generated_headers: ["android.hardware.renderscript.vts.driver@1.0_genc++_headers"],
-    shared_libs: [
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "liblog",
-        "libutils",
-        "libcutils",
-        "libvts_common",
-        "libvts_datatype",
-        "libvts_measurement",
-        "libvts_multidevice_proto",
-        "libcamera_metadata",
-        "libprotobuf-cpp-full",
-        "android.hidl.base@1.0",
-        "android.hardware.renderscript@1.0",
-    ],
-    export_shared_lib_headers: [
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libutils",
-        "android.hidl.base@1.0",
-    ],
-}
-
-genrule {
-    name: "android.hardware.renderscript@1.0-vts.profiler_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
-    srcs: [
-        "types.hal",
-        "IContext.hal",
-        "IDevice.hal",
-    ],
-    out: [
-        "android/hardware/renderscript/1.0/types.vts.cpp",
-        "android/hardware/renderscript/1.0/Context.vts.cpp",
-        "android/hardware/renderscript/1.0/Device.vts.cpp",
-    ],
-}
-
-genrule {
-    name: "android.hardware.renderscript@1.0-vts.profiler_genc++_headers",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
-    srcs: [
-        "types.hal",
-        "IContext.hal",
-        "IDevice.hal",
-    ],
-    out: [
-        "android/hardware/renderscript/1.0/types.vts.h",
-        "android/hardware/renderscript/1.0/Context.vts.h",
-        "android/hardware/renderscript/1.0/Device.vts.h",
-    ],
-}
-
-cc_library_shared {
-    name: "android.hardware.renderscript@1.0-vts.profiler",
-    generated_sources: ["android.hardware.renderscript@1.0-vts.profiler_genc++"],
-    generated_headers: ["android.hardware.renderscript@1.0-vts.profiler_genc++_headers"],
-    export_generated_headers: ["android.hardware.renderscript@1.0-vts.profiler_genc++_headers"],
-    shared_libs: [
-        "libbase",
-        "libhidlbase",
-        "libhidltransport",
-        "libvts_profiling",
-        "libvts_multidevice_proto",
-        "libprotobuf-cpp-full",
-        "android.hidl.base@1.0",
-        "android.hardware.renderscript@1.0",
-    ],
-}
diff --git a/renderscript/1.0/Android.mk b/renderscript/1.0/Android.mk
index 3a7babdb4..5c3a37db0 100644
--- a/renderscript/1.0/Android.mk
+++ b/renderscript/1.0/Android.mk
@@ -8,7 +8,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := android.hardware.renderscript@1.0-java-constants
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
 
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 #
diff --git a/tests/versioning/2.3/Android.bp b/tests/versioning/2.3/Android.bp
index 3cc207646..122c484a9 100644
--- a/tests/versioning/2.3/Android.bp
+++ b/tests/versioning/2.3/Android.bp
@@ -63,7 +63,6 @@ cc_library_shared {
         "libcutils",
         "android.hardware.tests.versioning@1.0",
         "android.hardware.tests.versioning@2.2",
-        "android.hidl.base@1.0",
     ],
     export_shared_lib_headers: [
         "libhidlbase",
@@ -72,6 +71,5 @@ cc_library_shared {
         "libutils",
         "android.hardware.tests.versioning@1.0",
         "android.hardware.tests.versioning@2.2",
-        "android.hidl.base@1.0",
     ],
 }