diff options
| author | Leon Scroggins III <scroggo@google.com> | 2015-07-31 10:38:40 -0400 |
|---|---|---|
| committer | Tom Hudson <tomhudson@google.com> | 2015-10-29 12:29:03 -0400 |
| commit | f35b989d26bb98900f6c5fa2e586326b30b6e161 (patch) | |
| tree | c3a9baef08336c3ddbda8bacd572355d2b01c21b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 438c220d78482c85b16a108d9ffde6d7ada27d19 (diff) | |
Merge six commits from master-skia to master
Also corrects some code under development behind the HWUI_NEW_OPS flags
to match the updated Skia API.
Include external/skia/include/private
use SrcConstraint for drawBitmapRect
clean up to allow removal of flags for SCALAR_DIV and IMAGEINFO_FIELDS
don't call DEPRECATED getDevice()
update to newer API for drawBitmapRect
asABitmap is deprecated, used isABitmap
previous-Change-Id: I12208855a95948897077b1c1549eb35416cc801e
previous-Change-Id: I5044f0f61315fe48c60d7af5e261a7d0ed574f56
previous-Change-Id: Ic34a3ba77b3f9e091fa7aaba75018a307abacdab
previous-Change-Id: I79f8dd779920565d1204f7fe67b3286b1bbf4e9b
previous-Change-Id: Ic04d1f8274f6a862ea00f8d241363cf31f5ec1ec
previous-Change-Id: I9e4ae257a1976c74302b6a73f17405174ae58cec
previous-Change-Id: I85de3462ad1e4877784df38edc4bcd0acbd24e5e
Change-Id: Ide8e2f669e91a13c32521af3a16efdaa085c81d0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions