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

Commit 9c724d78 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android 10 into master 

Bug: 139893257
Change-Id: I0b8ce4715e111f1378ddada95d746b1788645a6d
parents 0bc23613 638c0785

libs/gui/CleanSpec.mk→CleanSpec.mk

+7 −5
Original line number Diff line number Diff line 
# Copyright (C) 2012 The Android Open Source Project

# Copyright (C) 2018 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -44,9 +44,11 @@ 
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)

#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

$(call add-clean-step, find $(PRODUCT_OUT) -type f -name "libdvr.so" -print0 | xargs -0 rm -f)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libdvr_intermediates)

$(call add-clean-step, find $(PRODUCT_OUT) -type f -name "libgui*" -print0 | xargs -0 rm -f)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libgui_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libgui_intermediates)
 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/thermalserviced)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/thermalservice.rc)

$(call add-clean-step, find $(PRODUCT_OUT) -type f -name "gpuservice*" -print0 | xargs -0 rm -f)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/gpuservice_intermediates)

PREUPLOAD.cfg

+2 −0
Original line number Diff line number Diff line
@@ -7,8 +7,10 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               libs/binder/ndk/

               libs/graphicsenv/

               libs/gui/

               libs/renderengine/

               libs/ui/

               libs/vr/

               services/bufferhub/

               services/surfaceflinger/

               services/vr/

cmds/atrace/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "CtsAtraceHostTestCases"

    }

  ]

}

cmds/atrace/atrace.cpp

+26 −24
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static const TracingCategory k_categories[] = { 
    { "vibrator",   "Vibrator",                 ATRACE_TAG_VIBRATOR, { } },

    { "aidl",       "AIDL calls",               ATRACE_TAG_AIDL, { } },

    { "nnapi",      "NNAPI",                    ATRACE_TAG_NNAPI, { } },

    { "rro",        "Runtime Resource Overlay", ATRACE_TAG_RRO, { } },

    { k_coreServiceCategory, "Core services", 0, { } },

    { k_pdxServiceCategory, "PDX services", 0, { } },

    { "sched",      "CPU Scheduling",   0, {
@@ -890,6 +891,7 @@ static void cleanUpUserspaceTracing() 
    setTagsProperty(0);

    clearAppProperties();

    pokeBinderServices();

    pokeHalServices();



    if (g_tracePdx) {

        ServiceUtility::PokeServices();

cmds/atrace/atrace_userdebug.rc

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ on post-fs 
    chmod 0666 /sys/kernel/debug/tracing/events/workqueue/enable

    chmod 0666 /sys/kernel/tracing/events/regulator/enable

    chmod 0666 /sys/kernel/debug/tracing/events/regulator/enable

    chmod 0666 /sys/kernel/tracing/events/pagecache/enable

    chmod 0666 /sys/kernel/debug/tracing/events/pagecache/enable

    chmod 0666 /sys/kernel/tracing/events/filemap/enable

    chmod 0666 /sys/kernel/debug/tracing/events/filemap/enable



    # irq

    chmod 0666 /sys/kernel/tracing/events/irq/enable