fix build
Change-Id: Ic3c561e83244bc7967b518772c153209e9d2e4cf
diff --git a/Android.mk b/Android.mk
index 96f3f36..7acb00e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,26 +38,6 @@
$(hide) unzip $@ -d $(VTS_TESTCASES_OUT)
$(hide) touch -f $(VTS_TESTCASES_OUT)/vts/__init__.py
-define vts-get-package-paths
-$(foreach pkg,$(1),$(VTS_TESTCASES_OUT)/$(pkg).apk)
-endef
-
-include $(BUILD_SYSTEM)/definitions.mk
-
-define vts-copy-apk
-$(hide) $(ACP) -fp out/target/product/$(TARGET_PRODUCT)/data/app/$(1)/$(1).apk $(VTS_TESTCASES_OUT)
-endef
-
-define vts-copy-bin
-$(hide) $(ACP) -fp $(call intermediates-dir-for,EXECUTABLES,$(1),,,true)/$(2) $(VTS_TESTCASES_OUT)
-$(hide) $(ACP) -fp $(call intermediates-dir-for,EXECUTABLES,$(1))/$(3) $(VTS_TESTCASES_OUT)
-endef
-
-define vts-copy-lib
-$(hide) $(ACP) -fp $(call intermediates-dir-for,SHARED_LIBRARIES,$(1),,,true)/LINKED/$(1).so $(VTS_TESTCASES_OUT)/$(2).so
-$(hide) $(ACP) -fp $(call intermediates-dir-for,SHARED_LIBRARIES,$(1))/LINKED/$(1).so $(VTS_TESTCASES_OUT)/$(3).so
-endef
-
vts_apk_packages := \
CtsVerifier \
sl4a \
@@ -90,41 +70,14 @@
android.hardware.tests.libhwbinder@1.0 \
android.hardware.tests.libbinder \
lights.bullhead-vts \
- # android.hardware.power@1.0 \
vts_test_bin_hal_packages := \
- # hidl-power.default \
.PHONY: vts_runner_python
vts_runner_python: $(VTS_PYTHON_ZIP)
.PHONY: vts
-# TODO restore $(vts_apk_packages) $(vts_bin_packages) $(vts_lib_packages) $(vts_test_bin_packages) $(vts_test_lib_hidl_packages) $(vts_test_lib_hal_packages) $(vts_test_bin_hal_packages) | $(ACP)
-vts: $(VTS_PYTHON_ZIP) | $(ACP)
- # $(call vts-copy-apk,CtsVerifier) # apks
- # $(call vts-copy-apk,sl4a)
- # $(call vts-copy-bin,vts_hal_agent,vts_hal_agent32,vts_hal_agent64) # framework bins
- # $(call vts-copy-bin,vtssysfuzzer,fuzzer32,fuzzer64)
- # $(call vts-copy-bin,vts_shell_driver,vts_shell_driver32,vts_shell_driver64)
- # $(call vts-copy-lib,libvts_interfacespecification,libvts_interfacespecification,libvts_interfacespecification64) # framework libs
- # $(call vts-copy-lib,libvts_drivercomm,libvts_drivercomm,libvts_drivercomm64)
- # $(call vts-copy-lib,libvts_multidevice_proto,libvts_multidevice_proto,libvts_multidevice_proto64)
- # $(call vts-copy-lib,libvts_profiling,libvts_profiling,libvts_profiling64)
- # $(call vts-copy-lib,libvts_datatype,libvts_datatype,libvts_datatype64)
- # $(call vts-copy-lib,libvts_common,libvts_common,libvts_common64)
- # $(call vts-copy-lib,libvts_codecoverage,libvts_codecoverage,libvts_codecoverage64)
- # $(call vts-copy-lib,libvts_measurement,libvts_measurement,libvts_measurement64)
- # $(call vts-copy-bin,libhwbinder_benchmark,libhwbinder_benchmark32,libhwbinder_benchmark64) # test bins
- # $(call vts-copy-bin,libbinder_benchmark,libbinder_benchmark32,libbinder_benchmark64)
- # $(call vts-copy-bin,28838221_poc,28838221_poc32,28838221_poc64)
- # $(call vts-copy-bin,30149612_poc,30149612_poc32,30149612_poc64)
- # $(call vts-copy-lib,libhwbinder,libhwbinder,libhwbinder64) # test libs
- # $(call vts-copy-lib,android.hardware.tests.libhwbinder@1.0,android.hardware.tests.libhwbinder@1.0,android.hardware.tests.libhwbinder@1.064) # HAL libs
- # $(call vts-copy-lib,android.hardware.tests.libbinder,android.hardware.tests.libbinder,android.hardware.tests.libbinder64)
- # $(call vts-copy-lib,lights.bullhead-vts,lights.bullhead-vts,lights.bullhead-vts64)
- # TODO: enable when hidl-power is merged.
- # $(call vts-copy-lib,android.hardware.power@1.0,android.hardware.power@1.0,android.hardware.power@1.064)
- # $(call vts-copy-bin,hidl-power.default,hidl-power.default32,hidl-power.default64) # HAL bins
+vts: $(VTS_PYTHON_ZIP)
endif # vts
endif # linux