Merge "Add ability to granularly configure fuzzers. Each fuzz test will now have its own json config file."
diff --git a/drivers/libprofiling/Android.mk b/drivers/libprofiling/Android.mk
index a6486bf..f200e2b 100644
--- a/drivers/libprofiling/Android.mk
+++ b/drivers/libprofiling/Android.mk
@@ -32,7 +32,8 @@
 LOCAL_SHARED_LIBRARIES := \
   libbase \
   libcutils \
-  libhidl \
+  libhidlbase \
+  libhidltransport\
   libhwbinder \
   libvts_multidevice_proto \
   libprotobuf-cpp-full \
diff --git a/specification/Android.mk b/specification/Android.mk
index d87c888..8928107 100644
--- a/specification/Android.mk
+++ b/specification/Android.mk
@@ -87,7 +87,8 @@
 ifeq ($(VTS_ENABLE_TREBLE), true)
 LOCAL_SHARED_LIBRARIES += \
   libhwbinder \
-  libhidl \
+  libhidlbase \
+  libhidltransport \
   libutils \
   android.hardware.nfc@1.0 \
   libvts_driver_hidl_nfc@1.0 \
diff --git a/testcases/hal/common/fuzz/Android.hal_fuzzer.mk b/testcases/hal/common/fuzz/Android.hal_fuzzer.mk
index 29fce82..7cadcfe 100644
--- a/testcases/hal/common/fuzz/Android.hal_fuzzer.mk
+++ b/testcases/hal/common/fuzz/Android.hal_fuzzer.mk
@@ -35,7 +35,8 @@
 LOCAL_SHARED_LIBRARIES := \
     $(module_shared_libraries) \
     libutils \
-    libhidl \
+    libhidlbase \
+    libhidltransport \
     libhardware \
 
 LOCAL_ARM_MODE := arm
diff --git a/testcases/hal/vibrator/hidl/target_profiling/VibratorHidlTargetProfilingTest.config b/testcases/hal/vibrator/hidl/target_profiling/VibratorHidlTargetProfilingTest.config
new file mode 100644
index 0000000..912d8d5
--- /dev/null
+++ b/testcases/hal/vibrator/hidl/target_profiling/VibratorHidlTargetProfilingTest.config
@@ -0,0 +1,3 @@
+{
+    "enable_profiling": true
+}
\ No newline at end of file
diff --git a/tools/build/tasks/list/vts_test_lib_hidl_package_list.mk b/tools/build/tasks/list/vts_test_lib_hidl_package_list.mk
index e27fb0e..65cf373 100644
--- a/tools/build/tasks/list/vts_test_lib_hidl_package_list.mk
+++ b/tools/build/tasks/list/vts_test_lib_hidl_package_list.mk
@@ -15,7 +15,8 @@
 
 vts_test_lib_hidl_packages := \
   libhwbinder \
-  libhidl \
+  libhidlbase \
+  libhidltransport \
   libvts_driver_hidl_nfc@1.0 \
   libvts_profiler_hidl_nfc@1.0 \
   libvts_driver_hidl_vibrator@1.0 \