Merge "DO NOT MERGE: Merge Oreo MR1 into master" (4ae4b9c6) · Commits · e / os / platform_frameworks_native

Android.bp

+7 −0

Original line number	Diff line number	Diff line
		@@ -8,8 +8,15 @@ ndk_headers {

		subdirs = [
		"cmds/*",
		"headers",
		"libs/*",
		"opengl",
		"services/*",
		"vulkan",
		]

		cc_library_headers {
		name: "libandroid_sensor_headers",
		vendor: true,
		export_include_dirs: ["include_sensor"],
		}

cmds/atrace/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ cc_binary {
		"libhidltransport",
		"liblog",
		"libutils",
		"libcutils",
		"libz",
		"libbase",
		],

cmds/atrace/atrace.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,7 @@ static const TracingCategory k_categories[] = {
		{ OPT, "events/sched/sched_waking/enable" },
		{ OPT, "events/sched/sched_blocked_reason/enable" },
		{ OPT, "events/sched/sched_cpu_hotplug/enable" },
		{ OPT, "events/cgroup/enable" },
		} },
		{ "irq", "IRQ Events", 0, {
		{ REQ, "events/irq/enable" },

cmds/atrace/atrace.rc

+4 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@ on post-fs
		chown root shell /sys/kernel/tracing/events/sched/sched_blocked_reason/enable
		chown root shell /sys/kernel/debug/tracing/events/sched/sched_cpu_hotplug/enable
		chown root shell /sys/kernel/tracing/events/sched/sched_cpu_hotplug/enable
		chown root shell /sys/kernel/debug/tracing/events/cgroup/enable
		chown root shell /sys/kernel/tracing/events/cgroup/enable
		chown root shell /sys/kernel/debug/tracing/events/power/cpu_frequency/enable
		chown root shell /sys/kernel/tracing/events/power/cpu_frequency/enable
		chown root shell /sys/kernel/debug/tracing/events/power/cpu_idle/enable
		@@ -77,6 +79,8 @@ on post-fs
		chmod 0664 /sys/kernel/tracing/events/sched/sched_blocked_reason/enable
		chmod 0664 /sys/kernel/debug/tracing/events/sched/sched_cpu_hotplug/enable
		chmod 0664 /sys/kernel/tracing/events/sched/sched_cpu_hotplug/enable
		chmod 0664 /sys/kernel/debug/tracing/events/cgroup/enable
		chmod 0664 /sys/kernel/tracing/events/cgroup/enable
		chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_frequency/enable
		chmod 0664 /sys/kernel/tracing/events/power/cpu_frequency/enable
		chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_idle/enable

cmds/dumpstate/Android.mk

+1 −26

Original line number	Diff line number	Diff line
		@@ -17,31 +17,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
		LOCAL_SRC_FILES := \
		tests/dumpstate_test_fixture.cpp

		LOCAL_MODULE_CLASS := NATIVE_TESTS

		dumpstate_tests_intermediates := $(local-intermediates-dir)/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 := $(dumpstate_tests_intermediates)/$(dumpstate_tests_subpath_from_data)
		testdata_files := $(call find-subdir-files, testdata/*)

		# Copy test data files to intermediates/DATA for use with LOCAL_PICKUP_FILES
		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)

		# Copy test data files again to $OUT/data so the tests can be run with adb sync
		# TODO: the build system should do this automatically
		GEN := $(addprefix $(TARGET_OUT_DATA)/$(dumpstate_tests_subpath_from_data)/, $(testdata_files))
		$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
		$(GEN): PRIVATE_CUSTOM_TOOL = cp $< $@
		$(GEN): $(TARGET_OUT_DATA)/$(dumpstate_tests_subpath_from_data)/testdata/% : $(LOCAL_PATH)/testdata/%
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		LOCAL_PICKUP_FILES := $(dumpstate_tests_intermediates)
		LOCAL_TEST_DATA := $(call find-test-data-in-subdirs, $(LOCAL_PATH), *, tests/testdata)

		include $(BUILD_NATIVE_TEST)