!226 清理遗留事件打点编译宏

Merge pull request !226 from caochuan/master

frameworks/native/BUILD.gn

@@ -63,7 +63,6 @@ ohos_shared_library("drm_framework") {
     "-fno-unwind-tables",
     "-Os",
   ]
-  cflags += [ "-DENABLE_DRM_SYSEVENT_CONTROL" ]
 
   if (target_cpu == "arm") {
     cflags += [ "-DBINDER_IPC_32BIT" ]

frameworks/native/drm/media_key_system_factory_impl.cpp

@@ -30,18 +30,14 @@ MediaKeySystemFactoryImpl::MediaKeySystemFactoryImpl()
 {
     DRM_DEBUG_LOG("MediaKeySystemFactoryImpl:0x%{public}06" PRIXPTR "MediaKeySystemFactoryImpl Instances create",
         FAKE_POINTER(this));
-    #ifdef ENABLE_DRM_SYSEVENT_CONTROL
     traceId_ = HiTraceChain::Begin("MediaKeySystemFactory", HITRACE_FLAG_DEFAULT);
-    #endif
     Init();
 }
 
 MediaKeySystemFactoryImpl::~MediaKeySystemFactoryImpl()
 {
     DRM_INFO_LOG("MediaKeySystemFactoryImpl::~MediaKeySystemFactoryImpl enter.");
-    #ifdef ENABLE_DRM_SYSEVENT_CONTROL
     HiTraceChain::End(traceId_);
-    #endif
     deathRecipient_ = nullptr;
     DRM_INFO_LOG("MediaKeySystemFactoryImpl::~MediaKeySystemFactoryImpl exit.");
 }
@@ -104,9 +100,7 @@ sptr<MediaKeySystemFactoryImpl> &MediaKeySystemFactoryImpl::GetInstance()
 void MediaKeySystemFactoryImpl::Init()
 {
     DRM_INFO_LOG("MediaKeySystemFactoryImpl::Init enter.");
-    #ifdef ENABLE_DRM_SYSEVENT_CONTROL
     HiTraceChain::SetId(traceId_);
-    #endif
     DRM_INFO_LOG("MediaKeySystemFactoryImpl::Init exit.");
 }
 

frameworks/native/test/fuzztest/mediakeydecryptndk_fuzzer/BUILD.gn

@@ -70,6 +70,7 @@ ohos_fuzztest("mediakeydecryptndkFuzzTest") {
     "c_utils:utils",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
+    "hitrace:libhitracechain",
     "ipc:ipc_core",
   ]
   subsystem_name = "multimedia"

frameworks/native/test/fuzztest/mediakeysessionndk_fuzzer/BUILD.gn

@@ -71,6 +71,7 @@ ohos_fuzztest("mediakeysessionndkFuzzTest") {
     "c_utils:utils",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
+    "hitrace:libhitracechain",
     "ipc:ipc_core",
   ]
   subsystem_name = "multimedia"

frameworks/native/test/fuzztest/mediakeysystemndk_fuzzer/BUILD.gn

@@ -70,6 +70,7 @@ ohos_fuzztest("mediakeysystemndkFuzzTest") {
     "c_utils:utils",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
+    "hitrace:libhitracechain",
     "ipc:ipc_core",
   ]
   subsystem_name = "multimedia"

frameworks/native/test/fuzztest/mediakeysystemndkfactory_fuzzer/BUILD.gn

@@ -69,6 +69,7 @@ ohos_fuzztest("mediakeysystemndkfactoryFuzzTest") {
     "c_utils:utils",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
+    "hitrace:libhitracechain",
     "ipc:ipc_core",
   ]
   subsystem_name = "multimedia"

frameworks/native/test/unittest/BUILD.gn

@@ -50,7 +50,6 @@ ohos_unittest("drm_framework_capi_unittest_v1_0") {
     debug = true
   }
   cflags = []
-  cflags += [ "-DENABLE_DRM_SYSEVENT_CONTROL" ]
   sources = [
     "../../../../frameworks/native/test/common/src/http.cpp",
     "../../../../frameworks/native/test/unittest/src/drm_framework_dfx_unittest.cpp",

interfaces/inner_api/native/drm/media_key_system_factory_impl.h

@@ -24,9 +24,7 @@
 #include "i_mediakeysystemfactory_service.h"
 #include "drm_death_recipient.h"
 #include "drm_log.h"
-#ifdef ENABLE_DRM_SYSEVENT_CONTROL
 #include "hitrace/tracechain.h"
-#endif
 
 namespace OHOS {
 namespace DrmStandard {
@@ -54,9 +52,7 @@ private:
     static sptr<MediaKeySystemFactoryImpl> mediaKeySystemFactoryImpl_;
     sptr<DrmDeathRecipient> deathRecipient_ = nullptr;
     sptr<DrmListenerStub> listenerStub_ = nullptr;
-    #ifdef ENABLE_DRM_SYSEVENT_CONTROL
     HiviewDFX::HiTraceId traceId_;
-    #endif
 };
 } // DrmStandard
 } // OHOS

interfaces/kits/c/drm_capi/BUILD.gn

@@ -78,6 +78,7 @@ ohos_shared_library("native_drm") {
     "hiappevent:hiappevent_innerapi",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
+    "hitrace:libhitracechain",
     "ipc:ipc_core",
   ]
   innerapi_tags = [ "ndk" ]

interfaces/kits/js/drm_napi/BUILD.gn

@@ -68,6 +68,7 @@ ohos_shared_library("drm_napi") {
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
+    "hitrace:libhitracechain",
     "ipc:ipc_core",
     "napi:ace_napi",
   ]