commit cef0298e2540e6ad8c2728e6fcc007247c68aac0
author Felipe Leme <felipeal@google.com> Mon Oct 03 17:22:22 2016 -0700
committer Felipe Leme <felipeal@google.com> Fri Oct 07 09:04:26 2016 -0700
tree 3ea488935d33aa58ec984c616944865a7aad8c7c
parent f7bbdab3e8a3f6b108f502c8421d5bd08089a1c7

Added tests for DumpFile.

BUG: 31807540
BUG: 30564705

Test: mmm -j32 frameworks/native/cmds/dumpstate/ && adb push ${ANDROID_PRODUCT_OUT}/data/nativetest/dumpstate_test* /data/nativetest && adb shell /data/nativetest/dumpstate_test/dumpstate_test

Change-Id: Ide3a8d5f4b2c02b752ce6f6692c83b71ebdf62ed

cmds/dumpstate/Android.mk

diff --git a/cmds/dumpstate/Android.mk b/cmds/dumpstate/Android.mk
index 2eb512f..695e464 100644
--- a/cmds/dumpstate/Android.mk
+++ b/cmds/dumpstate/Android.mk
@@ -78,7 +78,23 @@
 
 LOCAL_CFLAGS := $(COMMON_LOCAL_CFLAGS)
 
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
 LOCAL_SRC_FILES := \
         tests/dumpstate_test_fixture.cpp
 
+dist_zip_root := $(TARGET_OUT_DATA)
+dumpstate_tests_subpath_from_data := nativetest/dumpstate_test_fixture
+dumpstate_tests_root_in_device := /data/$(dumpstate_tests_subpath_from_data)
+dumpstate_tests_root_for_test_zip := $(dist_zip_root)/$(dumpstate_tests_subpath_from_data)
+testdata_files := $(call find-subdir-files, testdata/*)
+
+GEN := $(addprefix $(dumpstate_tests_root_for_test_zip)/, $(testdata_files))
+$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN): PRIVATE_CUSTOM_TOOL = cp $< $@
+$(GEN): $(dumpstate_tests_root_for_test_zip)/testdata/% : $(LOCAL_PATH)/testdata/%
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+LOCAL_PICKUP_FILES := $(dist_zip_root)
+
 include $(BUILD_NATIVE_TEST)