From 04c2a19598fadcfb77a4231e3dd8eef832d55356 Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Fri, 11 Aug 2017 14:52:56 -0700 Subject: [PATCH] Tetheroffload tests static link to HAL def libs. Bug: 64040096 Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check --skip-preconditions --module VtsHalTetherOffloadControlV1_0Target Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check --skip-preconditions --module VtsHalTetherOffloadConfigV1_0Target Change-Id: Ib771c07646f3e219c7b9ba4be5515552d7fd6348 --- .../config/1.0/vts/functional/Android.bp | 17 ++--------------- .../control/1.0/vts/functional/Android.bp | 15 ++------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/tetheroffload/config/1.0/vts/functional/Android.bp b/tetheroffload/config/1.0/vts/functional/Android.bp index 2e720c6855..dc95eaa28d 100644 --- a/tetheroffload/config/1.0/vts/functional/Android.bp +++ b/tetheroffload/config/1.0/vts/functional/Android.bp @@ -14,20 +14,7 @@ cc_test { name: "VtsHalTetheroffloadConfigV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalTetheroffloadConfigV1_0TargetTest.cpp"], - shared_libs: [ - "android.hardware.tetheroffload.config@1.0", - "libbase", - "libcutils", - "libhidlbase", - "libhidltransport", - "liblog", - "libutils", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", - ], + static_libs: ["android.hardware.tetheroffload.config@1.0"], } diff --git a/tetheroffload/control/1.0/vts/functional/Android.bp b/tetheroffload/control/1.0/vts/functional/Android.bp index 69fac6e57f..c6216a2f97 100644 --- a/tetheroffload/control/1.0/vts/functional/Android.bp +++ b/tetheroffload/control/1.0/vts/functional/Android.bp @@ -14,21 +14,10 @@ cc_test { name: "VtsHalTetheroffloadControlV1_0TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalTetheroffloadControlV1_0TargetTest.cpp"], - shared_libs: [ + static_libs: [ "android.hardware.tetheroffload.config@1.0", "android.hardware.tetheroffload.control@1.0", - "libbase", - "libcutils", - "libhidlbase", - "libhidltransport", - "liblog", - "libutils", - ], - static_libs: ["VtsHalHidlTargetTestBase"], - cflags: [ - "-O0", - "-g", ], }