Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ad06c32 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "Tracking SamplingProfiler change in libcore"

parents 70a17055 a9602db3
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ fwbase_dirs_to_document := \
fwbase_dirs_to_document += core/config/sdk

# include definition of libcore_to_document
# These are relative to libcore
include $(LOCAL_PATH)/../../libcore/Docs.mk

non_base_dirs := \
@@ -324,8 +323,7 @@ non_base_dirs := \
# These are relative to frameworks/base
dirs_to_document := \
	$(fwbase_dirs_to_document) \
	$(non_base_dirs) \
	$(addprefix ../../libcore/, $(libcore_to_document))
	$(non_base_dirs)

html_dirs := \
	$(FRAMEWORKS_BASE_SUBDIRS) \
@@ -334,7 +332,8 @@ html_dirs := \
# These are relative to frameworks/base
framework_docs_LOCAL_SRC_FILES := \
	$(call find-other-java-files, $(dirs_to_document)) \
	$(call find-other-html-files, $(html_dirs))
	$(call find-other-html-files, $(html_dirs)) \
	$(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore))

# This is used by ide.mk as the list of source files that are
# always included.
+3 −2
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ import android.content.pm.PackageInfo;
import android.os.Build;
import android.os.SystemProperties;
import android.util.Log;
import dalvik.system.SamplingProfiler;
import dalvik.system.profiler.AsciiHprofWriter;
import dalvik.system.profiler.SamplingProfiler;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
@@ -162,7 +163,7 @@ public class SamplingProfilerIntegration {
        try {
            out = new PrintStream(new BufferedOutputStream(new FileOutputStream(path)));
            generateSnapshotHeader(name, packageInfo, out);
            new SamplingProfiler.AsciiHprofWriter(INSTANCE.getHprofData(), out).write();
            new AsciiHprofWriter(INSTANCE.getHprofData(), out).write();
            if (out.checkError()) {
                throw new IOException();
            }