Rename perf-setup.sh module to perf-setup
Previous naming causes module to be installed in
testcases/perf-setup.sh/perf-setup.sh. This caused issues in Tradefed
configuration where PushFilePreparer would push the directory
testcases/perf-setup.sh/ instead of the script.
Bug: 170349152
Test: m perf-setup
Change-Id: I984bf0995c7579724e1572f864ea76c5aa9b77d2
diff --git a/build/tasks/tests/instrumentation_metric_test_list.mk b/build/tasks/tests/instrumentation_metric_test_list.mk
index aa5dc81..29bfe4b 100644
--- a/build/tasks/tests/instrumentation_metric_test_list.mk
+++ b/build/tasks/tests/instrumentation_metric_test_list.mk
@@ -36,5 +36,5 @@
#DocumentsUIPerfTests
ifneq ($(strip $(BOARD_PERFSETUP_SCRIPT)),)
-instrumentation_metric_tests += perf-setup.sh
+instrumentation_metric_tests += perf-setup
endif
diff --git a/build/tasks/tests/native_metric_test_list.mk b/build/tasks/tests/native_metric_test_list.mk
index bbde9da..45ae1ca 100644
--- a/build/tasks/tests/native_metric_test_list.mk
+++ b/build/tasks/tests/native_metric_test_list.mk
@@ -32,5 +32,5 @@
VibratorHalIntegrationBenchmark
ifneq ($(strip $(BOARD_PERFSETUP_SCRIPT)),)
-native_metric_tests += perf-setup.sh
+native_metric_tests += perf-setup
endif
diff --git a/build/tasks/tests/platform_test_list.mk b/build/tasks/tests/platform_test_list.mk
index a6b9433..c015b05 100644
--- a/build/tasks/tests/platform_test_list.mk
+++ b/build/tasks/tests/platform_test_list.mk
@@ -116,7 +116,7 @@
WifiStrengthScannerUtil \
ifneq ($(strip $(BOARD_PERFSETUP_SCRIPT)),)
-platform_tests += perf-setup.sh
+platform_tests += perf-setup
endif
ifneq ($(filter vsoc_arm vsoc_arm64 vsoc_x86 vsoc_x86_64, $(TARGET_BOARD_PLATFORM)),)
diff --git a/scripts/perf-setup/Android.mk b/scripts/perf-setup/Android.mk
index 7480218..91ff9c1 100644
--- a/scripts/perf-setup/Android.mk
+++ b/scripts/perf-setup/Android.mk
@@ -36,10 +36,11 @@
ifneq ($(strip $(BOARD_PERFSETUP_SCRIPT)),)
include $(CLEAR_VARS)
-LOCAL_MODULE := perf-setup.sh
+LOCAL_MODULE := perf-setup
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/local/tmp
+LOCAL_MODULE_STEM := perf-setup.sh
LOCAL_PREBUILT_MODULE_FILE := $(BOARD_PERFSETUP_SCRIPT)
LOCAL_COMPATIBILITY_SUITE := device-tests
include $(BUILD_PREBUILT)
