diff options
| author | Glen Kuhne <kuh@google.com> | 2016-10-25 12:40:35 -0700 |
|---|---|---|
| committer | Glen Kuhne <kuh@google.com> | 2017-02-17 16:43:41 -0800 |
| commit | 173c3b3e8966eeac45602fa97728b2783b4f5f46 (patch) | |
| tree | 09362fc858caa43618d37032d7fa82e8871e10a2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 313e645801e561dbf25320110ab4790a33720dae (diff) | |
Move wifi.proto to shared service .jar
Changes to ART are causing nano-proto's generated java base classes
to conflict with their duplicates in other projects, leading to a
NullPointerException.
Moving wifi.proto to the same build as other framework service protos in order
for them to share and not generate a duplicate CodedOutputByteBufferNano
classes.
wifi.proto previously lived at:
frameworks/opt/net/wifi/service/proto/wifi.proto
Merged-In: Ia30391453e8d6614edc7f4397e9c17cfe95cf63e
Bug: 32261442
Test: Builds, and existing Unit tests pass
Change-Id: Ia30391453e8d6614edc7f4397e9c17cfe95cf63e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions