Colin Cross
ac6414524c
Merge "Update layoutlib to match java library changes"
2017-04-06 15:30:45 +00:00
Colin Cross
15d1878206
Update layoutlib to match java library changes
...
javalib.jar is now only used for jars that contain dex files, so
host java libraries are now always called classes.jar. Update
layoutlib's custom rules to match. Also remove built_ext_data,
the classes.jar in built_ext_classes already contains the
resources.
Test: layoutlib-tests
Change-Id: I522d9e3786ad7deeb291c7c1a61ec4b86be03dc2
2017-03-29 16:52:16 -07:00
Eric Laurent
330ac1223a
Merge "Load hyphenation patterns for Bulgarian and Church Slavonic"
...
am: 70bc4a8036
Change-Id: Iac325d28a09f4ddceb93ec85beba0eabfd393992
2017-02-24 19:45:28 +00:00
Roozbeh Pournader
e626fb53e2
Load hyphenation patterns for Bulgarian and Church Slavonic
...
Patterns for Bulgarian (bg) and Church Slavonic (cu) are now loaded
too.
Also make changes to fontchain_lint.py, so it knows the script for Bulgarian
and Church Slavonic is Cyrillic.
Test: make -j works and creates .hyb files for bg and cu
Change-Id: I0586f6c49380279ef88fe952b5cfd2d3594c5524
2017-02-24 11:23:48 -08:00
Colin Cross
886d642fb6
Merge "Use asm-5.2 prebuilt" am: 6b32770d6d am: 6c1ac4dd80
...
am: 29fd14f9ee
Change-Id: I0b08a521058a82ca801f020bd63dc9ccb4bf3a28
2017-02-14 19:22:27 +00:00
Colin Cross
29fd14f9ee
Merge "Use asm-5.2 prebuilt" am: 6b32770d6d
...
am: 6c1ac4dd80
Change-Id: Icc01bcd92c5b23198bb39ff382610c72b4bf1867
2017-02-14 19:17:24 +00:00
Colin Cross
80e86bae0e
Use asm-5.2 prebuilt
...
Test: m -j checkbuild tests cts
Change-Id: I37d40cc2e0406679394012aacd49f7ca9e51e3f6
2017-02-13 12:54:10 -08:00
Paul Navin
dd91db5515
Add hidden API for whether permission review mode is on. am: 7b89a7b1f7
...
am: 7c230c6f3c
Change-Id: I89c9a580a96d0f69ed30cad9ec2e4f9c215a403b
2017-01-27 16:59:33 +00:00
Paul Navin
7c230c6f3c
Add hidden API for whether permission review mode is on.
...
am: 7b89a7b1f7
Change-Id: I925b6de9f79850dcc816a73357d1d589eeac6333
2017-01-27 16:55:03 +00:00
Paul Navin
7b89a7b1f7
Add hidden API for whether permission review mode is on.
...
BUG: 34240393
Change-Id: I68e55767a7da1d457a6cedd210aac9e339fb996c
2017-01-27 03:42:32 +00:00
Tamas Berghammer
24d8553316
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
...
This reverts commit cbd3f0c59a75e0b46dbb0635e81f82b8b9617791.
Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
2017-01-18 19:33:22 +00:00
Tamas Berghammer
cbd3f0c59a
Update package names to work with the proto3 compiler
...
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit 383db5ebcc3a4a615faf249bf4f126f42e80b82e)
2017-01-11 11:27:38 +00:00
Michael Rosenfeld
bf5546b1e2
Merge "Clean up local hprofs" am: 9ab94e15c7 am: 1876d82450
...
am: 67fd9f3968
Change-Id: I8eaea581cfda4844c3ea81f7ee63f0cfc40ef3e0
2016-12-18 00:28:42 +00:00
Michael Rosenfeld
2b62809c70
Clean up local hprofs
...
* After use
* Upon failure
Test: manual tool use
Change-Id: I2669e190c3792522c121158ea2aec84fe577c9e3
2016-12-16 16:24:29 -08:00
Neil Fuller
28c9cd63d0
Merge "Track BufferIterator changes in libcore" am: 021e8ff2af am: 4ff3c27817
...
am: 228793a0c9
Change-Id: I86aa0f62941802a7f26957d475575bf9c92ba2ca
2016-12-12 17:45:15 +00:00
Neil Fuller
021e8ff2af
Merge "Track BufferIterator changes in libcore"
2016-12-12 17:23:18 +00:00
Michael Rosenfeld
cc3b7793a5
Merge "Copy preload2.jar to build artifacts" am: 64583c332a am: dc017c4e49
...
am: 6952303c28
Change-Id: I66fa8374ec9257e43b7fea02ef13ce51c2f628fc
2016-12-10 01:11:46 +00:00
Michael Rosenfeld
d19ea14f30
Copy preload2.jar to build artifacts
...
Test: local build
Bug: 33492076
Change-Id: I76de648cd1947e49278a678a4c6f1dce8092bbd4
2016-12-09 16:16:54 -08:00
Neil Fuller
5ba69e46ed
Track BufferIterator changes in libcore
...
Addition of a new method pos().
Bug: 31008728
Test: make
Change-Id: Id5fcb13104a8580ffaa7d4f8d3c473fe14ac5ccd
2016-12-09 14:59:26 +00:00
Michael Rosenfeld
c853f3a5ff
Merge "Add command line action sequencing." am: 880c9acf4a am: 3711f2f0c2
...
am: 2f5f210f7d
Change-Id: I10c2d3c3be0bb8748602b3a566f75f8c687f8889
2016-12-01 22:05:22 +00:00
Michael Rosenfeld
3711f2f0c2
Merge "Add command line action sequencing."
...
am: 880c9acf4a
Change-Id: I81b31d950e0dca525fbfe9aa38c9c113eea7cec8
2016-12-01 21:40:06 +00:00
Doris Liu
00d348ec26
Fix LUTInterpolator lookup table position calc
...
am: 0940834c8c
Change-Id: Ib80c00801473d7e60bae87b3b34a381c7f8e7e68
2016-12-01 01:33:52 +00:00
Doris Liu
0940834c8c
Fix LUTInterpolator lookup table position calc
...
BUG: 32830741
Test: running progress bar at 5x duration scale, no flickering
Change-Id: Ie484bdbfdf18bacc4586e36c5142e4523d08bdaa
2016-11-30 23:20:19 +00:00
Michael Rosenfeld
c37b0a40e7
Add command line action sequencing.
...
Supported actions:
* .. scan <process> ..
* .. scan-all ..
* .. import <infile> ..
* .. export <infile> ..
* .. comp <thresh> <outfile> ..
Test: manual
Bug: 31961946
Change-Id: I08753f31294ac5f30f6bcddeabef12d138e7e8e6
2016-11-30 11:26:33 -08:00
Andreas Gampe
b9d8535a21
Merge "Preload2: Add sequence UI"
...
am: 56ddac7fd7
Change-Id: I6ca6e1ea6c6721a24f7b1d3d7fb4715bd51aa0d9
2016-11-30 00:49:44 +00:00
Andreas Gampe
437474990d
Preload2: Add sequence UI
...
Add a fake UI that can run a sequence of actions (and replies).
Bug: 31961946
Test: manual
Change-Id: Iee0fac5ddf75a97eff7b401c9c932634489349de
2016-11-29 15:22:02 -08:00
Paul Duffin
6fc0c5ceca
Merge "Use junit-host instead of junit"
...
am: 6063357ae6
Change-Id: I6522cedeb522fa01530d4f31b6505b4d4c265312
2016-11-29 15:12:46 +00:00
Paul Duffin
4a064d2010
Use junit-host instead of junit
...
Bug: 30188076
Test: make checkbuild
Change-Id: I3496b9d7e40abf7712a56ba633a2becd0aa17c06
2016-11-29 14:52:42 +00:00
Paul Duffin
bbb501281e
Merge "Use junit-host instead of junit"
...
am: 7dda7e1e81
Change-Id: Ie070bf5329899f21e3fb65dae6db5fdd50e74ba9
2016-11-29 10:22:34 +00:00
Paul Duffin
7dda7e1e81
Merge "Use junit-host instead of junit"
2016-11-29 10:12:52 +00:00
Andreas Gampe
57c14c8ee6
Preload2: Add isSingleThreaded
...
am: 3bf65c916c
Change-Id: I6bf6c5b934cb89937bb329ea7b9f50c70b3a898d
2016-11-29 03:20:51 +00:00
Andreas Gampe
24cd3418c7
Preload2: Fix action inheritance
...
am: 1c809a3d32
Change-Id: I8ef23a6ee16b1462d65ef2d7a3f62e9d586c92ff
2016-11-29 03:20:12 +00:00
Andreas Gampe
826ec71e96
Preload2: Abstract out UI
...
am: 5cb8998363
Change-Id: Ia4a147e061397951ada72beac7c5781b8dbac918
2016-11-29 03:19:34 +00:00
Andreas Gampe
3bf65c916c
Preload2: Add isSingleThreaded
...
Expose whether a UI is single-threaded to avoid spawning threads
in actions.
Bug: 31961946
Test: manual
Change-Id: I37c8daa6a00784e833bad53b8e83ab4417955df7
2016-11-28 15:06:35 -08:00
Andreas Gampe
1c809a3d32
Preload2: Fix action inheritance
...
Use AbstractThreadedAction as a base.
Bug: 31961946
Test: manual
Change-Id: I5a05b65d753be775c8b8382bb1a81e869c388f8d
2016-11-28 15:04:25 -08:00
Andreas Gampe
5cb8998363
Preload2: Abstract out UI
...
Create IUI interface and move UI to SwingUI.
Bug: 31961946
Test: manual
Change-Id: If56347fdde8b441c0c01337a3f5eac002ea5b4f3
2016-11-28 13:15:10 -08:00
Paul Duffin
21cf84f8b3
Use junit-host instead of junit
...
Bug: 30188076
Test: make checkbuild
Change-Id: I5d3efbfbe3245a631113674bff1b0aabdc9fe8be
2016-11-28 16:44:44 +00:00
Andreas Gampe
74b4e070be
Merge "Preload2: Fix dependencies"
...
am: 3b379ee94e
Change-Id: If3ecad631e5f7deb9b2f348a26d9b41f8a00b4f5
2016-11-16 18:25:37 +00:00
Andreas Gampe
da69216ac6
Preload2: Fix dependencies
...
Also depend on and package tools-common.
Test: m
Test: preload-tool
Change-Id: I19a8844f87417f2292e50ffaaebb5fa24a2eca24
2016-11-14 19:08:22 -08:00
John Reck
946d11d216
Merge "Re-unite sources with their headers"
...
am: e43444a00b
Change-Id: I8f3ef6a1ddcf78d28f7444b6e83c552b8305fd8c
2016-11-04 21:47:34 +00:00
John Reck
03b5d506bc
Re-unite sources with their headers
...
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.
Also fixes -Werror issues that resulted in
no longer being -isystem.
Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
Merged-In: Ic4312eb61b197af114dded5691d5ae1ec82923f7
(cherry picked from commit f6113af2d6f6eebee68d3ac510fe96d38a7a39e9)
2016-11-04 13:27:37 -07:00
George Burgess IV
ea4423b181
Merge "Fix a static-analyzer warning."
...
am: 63b4f6f5db
Change-Id: I85fd6d25733d59da76eb0bab381fdbd3b5a0430d
2016-10-20 19:19:15 +00:00
Treehugger Robot
63b4f6f5db
Merge "Fix a static-analyzer warning."
2016-10-20 19:06:58 +00:00
Mark Salyzyn
6a8f0d70b0
Merge "missing includes"
...
am: 78929f3ee0
Change-Id: I3e7a25ded484d516fab453abe434c2e53cf0f27e
2016-10-17 21:25:59 +00:00
Mark Salyzyn
4d6c372eae
missing includes
...
Assumptions are made about header side effects
Test: compile
Bug: 30465923
Change-Id: Icc9415aed5e54b2bc00b70aa0da6df4148f30654
2016-10-17 12:32:54 -07:00
George Burgess IV
a40eeb0979
Merge "Fix static-analyzer warning." am: 2fbf30d3fe am: a52992e290
...
am: c88628da5e
Change-Id: Iece80dfbd8a5d01ffdcf6edf1decd8078af31511
2016-10-14 14:39:06 +00:00
George Burgess IV
56f5f7b79b
Fix a static-analyzer warning.
...
frameworks/base/tools/aapt2/util/Files.cpp:81:21: warning: Null pointer
passed as an argument to a 'nonnull' parameter
while ((entry = readdir(dir))) {
Bug: None.
Test: Warning no longer appears.
Change-Id: If242598405e995928378ce317a2e909654e1e985
2016-10-13 15:52:34 -07:00
George Burgess IV
0c2774b16a
Fix static-analyzer warning.
...
frameworks/base/tools/aapt/Images.cpp:845:17: warning: Assigned value is
garbage or undefined
row += bpp;
Bug: None.
Test: The warning is gone.
Change-Id: Idf4623d2510111a9188ed39922e109a8db225c76
2016-10-13 15:51:04 -07:00
Elliott Hughes
437b8c95a8
Merge "Rely on the platform -std default." am: 66f15cc01b am: 5a989a504a
...
am: 39ad1b92fa
Change-Id: Iec4bca8e96c776d61c5da5540a74acc6773c2bce
2016-10-08 22:03:56 +00:00
Elliott Hughes
c08e32e0be
Rely on the platform -std default.
...
Bug: http://b/32019064
Test: builds
Change-Id: I7180f1eb539ff8cbe33832d010775f053a922946
2016-10-07 15:57:17 -07:00