Fix proto file paths

Bug: 64831661
Test:  npm run dev
Change-Id: I2283175b50d96de7859b3e80de6228f55d766e67
This commit is contained in:
Vishnu Nair
2017-12-28 11:18:46 -08:00
parent 5c3ec8d78b
commit f60b79fdc2
4 changed files with 10 additions and 6 deletions

View File

@@ -68,8 +68,8 @@
<script>
import jsonProtoDefs from '../proto/frameworks/base/core/proto/android/server/windowmanagertrace.proto'
import jsonProtoDefsSF from '../proto/frameworks/native/services/surfaceflinger/layerproto/layerstrace.proto'
import jsonProtoDefs from 'frameworks/base/core/proto/android/server/windowmanagertrace.proto'
import jsonProtoDefsSF from 'frameworks/native/services/surfaceflinger/layerproto/layerstrace.proto'
import protobuf from 'protobufjs'
import TreeView from './TreeView.vue'

View File

@@ -24,7 +24,7 @@
<script>
import jsonProtoDefs from '../proto/frameworks/base/core/proto/android/server/windowmanagertrace.proto'
import jsonProtoDefs from 'frameworks/base/core/proto/android/server/windowmanagertrace.proto'
import protobuf from 'protobufjs'
var protoDefs = protobuf.Root.fromJSON(jsonProtoDefs);

View File

@@ -29,7 +29,7 @@
<script>
import jsonProtoDefs from '../proto/frameworks/base/core/proto/android/server/windowmanagertrace.proto'
import jsonProtoDefs from 'frameworks/base/core/proto/android/server/windowmanagertrace.proto'
import protobuf from 'protobufjs'
var protoDefs = protobuf.Root.fromJSON(jsonProtoDefs);

View File

@@ -44,7 +44,7 @@ module.exports = {
test: /\.proto$/,
loader: 'proto-loader',
options: {
paths: [path.resolve(__dirname, './proto'),]
paths: [path.resolve(__dirname, '../../..')]
}
},
{
@@ -59,7 +59,11 @@ module.exports = {
resolve: {
alias: {
'vue$': 'vue/dist/vue.esm.js'
}
},
modules: [
'node_modules',
path.resolve(__dirname, '../../..')
],
},
resolveLoader: {
modules: [