Build metrics_dump tool in Android.
Replace Makefile with Android.bp. Remove duplication of protos in proto directory. Since we are now building the metrics_dump tool under Android, use frameworks metrics.proto directly. Also, reference cdm's wv_metrics.proto from the cdm directory instead of creating a subset in proto directory. bug: 161783052 bug: 170607430 Test: build m -j128 metrics_dump Test: metrics_dump [bugreport from adt-3-r.zip] Test: metrics_dump [bugreport from sabrina-q.gz] Test: metrics_dump --widevine [adb shell dumpsys media.metrics output] Change-Id: I82c7e723453ac2a6335cb2bb732a376d535b9ea3
This commit is contained in:
@@ -1,10 +1,47 @@
|
||||
cc_library {
|
||||
// Copyright (C) 2020 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.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
name: "libcdm_metrics_protos",
|
||||
// Build host library for metrics_dump tool.
|
||||
cc_library_host_shared {
|
||||
|
||||
name: "libcdm_metrics_protos_full_host",
|
||||
vendor: true,
|
||||
|
||||
include_dirs: ["external/protobuf/src"],
|
||||
|
||||
srcs: [
|
||||
"wv_metrics.proto",
|
||||
"wv_metrics.proto",
|
||||
],
|
||||
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
|
||||
proto: {
|
||||
export_proto_headers: true,
|
||||
type: "full",
|
||||
},
|
||||
}
|
||||
|
||||
cc_library {
|
||||
|
||||
name: "libcdm_metrics_protos",
|
||||
vendor: true,
|
||||
|
||||
srcs: [
|
||||
"wv_metrics.proto",
|
||||
],
|
||||
|
||||
cflags: [
|
||||
@@ -16,5 +53,4 @@ cc_library {
|
||||
export_proto_headers: true,
|
||||
type: "full",
|
||||
},
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user