Merge "Move wayland support from default build" into rvc-dev am: 37ede275a6

Change-Id: Ic004f00ac26d6f1d65f0ec328b0cfb197584cc1e

tools/winscope/README.md

@@ -17,3 +17,7 @@ contain the proto definitions for their internal states.
 * Navigate to `development/tools/winscope`
 * Run `yarn run dev`
 
+### Building with internal extensions
+Internal paths in vendor/ which are not available in AOSP must be replaced by
+stub files. Actual path can be optionally picked up using env args. For
+example, to pick up Wayland support, run `WAYLAND=yes yarn run dev`

tools/winscope/src/decode.js

@@ -16,7 +16,7 @@
 
 
 import jsonProtoDefs from 'frameworks/base/core/proto/android/server/windowmanagertrace.proto'
-import jsonProtoLogDefs from 'ProtoLogSafePath/protolog.proto'
+import jsonProtoLogDefs from 'frameworks/base/core/proto/android/server/protolog.proto'
 import jsonProtoDefsSF from 'frameworks/native/services/surfaceflinger/layerproto/layerstrace.proto'
 import jsonProtoDefsTrans from 'frameworks/native/cmds/surfacereplayer/proto/src/trace.proto'
 import jsonProtoDefsWL from 'WaylandSafePath/waylandtrace.proto'

tools/winscope/src/stubs/protolog.proto

@@ -1,21 +0,0 @@
-/*
- * 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.
- */
-syntax = "proto2";
-
-package com.android.server.protolog;
-
-message ProtoLogMessage {}
-message ProtoLogFileProto {}

tools/winscope/src/stubs/services.core.protolog.json

@@ -1,3 +0,0 @@
-{
-    "version": "1.0.0"
-}

tools/winscope/src/transform_protolog.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import viewerConfig from "ProtoLogJsonSafePath/services.core.protolog.json"
+import viewerConfig from "../../../../frameworks/base/data/etc/services.core.protolog.json"
 
 import { nanos_to_string } from './transform.js'
 

tools/winscope/webpack.config.js

@@ -20,26 +20,10 @@ var HtmlWebpackPlugin = require('html-webpack-plugin')
 var HtmlWebpackInlineSourcePlugin = require('html-webpack-inline-source-plugin')
 
 function getWaylandSafePath() {
-  if (process.env.AOSP) {
-    return path.resolve(__dirname, 'src/stubs');
+  if (process.env.WAYLAND) {
+    return path.resolve(__dirname, '../../../vendor/google_arc/libs/wayland_service');
   }
-  return path.resolve(__dirname, '../../../vendor/google_arc/libs/wayland_service');
-}
-
-// b/148409169 remove once proto log support is in AOSP.
-function getProtoLogSafePath() {
-  if (process.env.AOSP) {
-    return path.resolve(__dirname, 'src/stubs');
-  }
-  return path.resolve(__dirname, '../../../frameworks/base/core/proto/android/server');
-}
-
-// b/148409169 remove once proto log support is in AOSP.
-function getProtoLogJsonSafePath() {
-  if (process.env.AOSP) {
-    return path.resolve(__dirname, 'src/stubs');
-  }
-  return path.resolve(__dirname, '../../../frameworks/base/data/etc');
+  return path.resolve(__dirname, 'src/stubs');
 }
 
 module.exports = {
@@ -86,8 +70,6 @@ module.exports = {
   resolve: {
     alias: {
         WaylandSafePath: getWaylandSafePath(),
-        ProtoLogSafePath: getProtoLogSafePath(),
-        ProtoLogJsonSafePath: getProtoLogJsonSafePath(),
     },
     modules: [
       'node_modules',