summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorGlen Kuhne <kuh@google.com>2016-10-25 12:40:35 -0700
committerGlen Kuhne <kuh@google.com>2016-10-26 11:04:08 -0700
commit94814570e995830ddf9c96cc9803398110d4671d (patch)
treee359b5031418b125ff62603f4091f304ce865905 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent0719940ce4c877c3b627b276accba9ebcfdeeeef (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 Bug: 32261442 Test: Builds, and existing Unit tests pass Change-Id: Ia30391453e8d6614edc7f4397e9c17cfe95cf63e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions