Commit graph

38380 commits

Author SHA1 Message Date
Colin Cross
bc45a33c93 Merge "Refactor prebuilt tools" 2017-07-07 20:19:24 +00:00
Ivan Lozano
4e684f5adb Merge "Add integer_overflow sanitization build option." am: 05900230fd am: 344306a4ac
am: 046d1535fa

Change-Id: I508544155ee260ef6249676910475ca7808ca5dc
2017-07-07 20:17:30 +00:00
Ivan Lozano
046d1535fa Merge "Add integer_overflow sanitization build option." am: 05900230fd
am: 344306a4ac

Change-Id: I79cf44e4fc20d2dd1317bb0614f6a41d73202524
2017-07-07 20:15:00 +00:00
Ivan Lozano
344306a4ac Merge "Add integer_overflow sanitization build option."
am: 05900230fd

Change-Id: Id2dcea2042497ddcb7bb0b83eebee583fe3c13f8
2017-07-07 20:12:56 +00:00
Ivan Lozano
05900230fd Merge "Add integer_overflow sanitization build option." 2017-07-07 20:07:20 +00:00
Colin Cross
cd20d5980c Refactor prebuilt tools
Put the prebuilt and non-prebuilt tools selections into the two
clauses of an if block to simplify the next patch.

Test: m -j checkbuild
Change-Id: Idd01bc81a2b619f7fc23df7566a01b46598433a3
2017-07-07 18:16:28 +00:00
Przemyslaw Szczepaniak
07f315d91d Merge "Enable stripping of java debug information when required." am: d659f806e5 am: 8c485b6b0c
am: a1847ffedf

Change-Id: I085608da575941de51eea8bc8deb7067a3673dd3
2017-07-07 15:56:22 +00:00
Andreas Gampe
04d270e9c7 Merge "Build: More tombstones in userdebug" am: 5378d0a7eb am: 205958cb38
am: ce2236d92a

Change-Id: I61c0e3bf530aee55ab9797c7a389413a7a6db8c9
2017-07-07 15:56:05 +00:00
Przemyslaw Szczepaniak
a1847ffedf Merge "Enable stripping of java debug information when required." am: d659f806e5
am: 8c485b6b0c

Change-Id: If09c1fd1d8c30d1763ef7534e042ef4e3839d1f0
2017-07-07 15:33:11 +00:00
Przemyslaw Szczepaniak
8c485b6b0c Merge "Enable stripping of java debug information when required."
am: d659f806e5

Change-Id: I25facf64b176ae26db07d43cef92c522bf92e79a
2017-07-07 15:29:40 +00:00
Andreas Gampe
ce2236d92a Merge "Build: More tombstones in userdebug" am: 5378d0a7eb
am: 205958cb38

Change-Id: Ie5390a231825f31fa2c945d1bdba228266302804
2017-07-07 15:26:41 +00:00
Treehugger Robot
d659f806e5 Merge "Enable stripping of java debug information when required." 2017-07-07 15:24:32 +00:00
Andreas Gampe
205958cb38 Merge "Build: More tombstones in userdebug"
am: 5378d0a7eb

Change-Id: I414a28b22f8677099ab61812995ca6715f8f2563
2017-07-07 15:23:48 +00:00
Treehugger Robot
5378d0a7eb Merge "Build: More tombstones in userdebug" 2017-07-07 15:17:03 +00:00
Andreas Gampe
0b24deb839 Build: More tombstones in userdebug
am: 47e137f357

Change-Id: I6dc83edb29170e1f5a3c70d823d5c3a8d0089a7e
2017-07-07 06:57:16 +00:00
Andreas Gampe
427e49e0da Build: More tombstones in userdebug
For devices using core_minimal, set the number of retained
tombstones in userdebug and eng builds to 50. This will help
with dogfooding.

(cherry picked from commit 47e137f357)

Bug: 63131375
Test: lunch bullhead_userdebug && m && fastboot flashall && adb getprop tombstoned.max_tombstone_count
Change-Id: I163d40f7a8f73df1af1228309d7a7a95511bdef9
2017-07-06 23:54:14 -07:00
Andreas Gampe
47e137f357 Build: More tombstones in userdebug
For devices using core_minimal, set the number of retained
tombstones in userdebug and eng builds to 50. This will help
with dogfooding.

Bug: 63131375
Test: lunch bullhead_userdebug && m && fastboot flashall && adb getprop tombstoned.max_tombstone_count
Change-Id: I163d40f7a8f73df1af1228309d7a7a95511bdef9
2017-07-06 21:20:54 -07:00
Dan Willemsen
8d843be680 Merge "Fix install location for vendor tests" am: af59c099c9 am: 113493d0c5
am: d2428079da

Change-Id: I3dc8202a9c0763a13343cdeedccf55b162b953d2
2017-07-07 03:44:56 +00:00
Dan Willemsen
d2428079da Merge "Fix install location for vendor tests" am: af59c099c9
am: 113493d0c5

Change-Id: Ifec317f2b69ec0bb9a2cba04285f1c9ca6065270
2017-07-07 03:41:56 +00:00
Dan Willemsen
113493d0c5 Merge "Fix install location for vendor tests"
am: af59c099c9

Change-Id: Iaf694543edfce134bc7d4951e949a76f1175b542
2017-07-07 03:38:33 +00:00
Treehugger Robot
af59c099c9 Merge "Fix install location for vendor tests" 2017-07-07 03:30:13 +00:00
Colin Cross
daa53818b7 Merge "Increase max heap size for javac to 2GB." am: ae67473255 -s ours am: c2b3797630 -s ours
am: 342ac430ef  -s ours

Change-Id: I5b9054c041575fbe2b345533c6b30c1a2372e5b9
2017-07-07 02:12:01 +00:00
Colin Cross
342ac430ef Merge "Increase max heap size for javac to 2GB." am: ae67473255 -s ours
am: c2b3797630  -s ours

Change-Id: Id68c31237b9c2836402448aa18cddbb107ed1dae
2017-07-07 02:09:03 +00:00
Colin Cross
c2b3797630 Merge "Increase max heap size for javac to 2GB."
am: ae67473255  -s ours

Change-Id: I9e103af8edc458a138858032a0a691ed97d1a4ad
2017-07-07 02:06:01 +00:00
Treehugger Robot
ae67473255 Merge "Increase max heap size for javac to 2GB." 2017-07-07 01:57:16 +00:00
Bryan Eyler
3458b5f5a9 Merge "Re-compute DX command if it changes for PDK." am: 7edc11830a am: 1558db6a87
am: 0602eacffe

Change-Id: I85fc208af6c4b173df917bf3cd6e5d0c26e8c72c
2017-07-07 01:38:51 +00:00
Bryan Eyler
0602eacffe Merge "Re-compute DX command if it changes for PDK." am: 7edc11830a
am: 1558db6a87

Change-Id: I01ebe1958d0a337d7875c171c7f680560ef240ea
2017-07-07 01:35:50 +00:00
Bryan Eyler
1558db6a87 Merge "Re-compute DX command if it changes for PDK."
am: 7edc11830a

Change-Id: Ied18008a334db388efe5d396bc3a7186f6c7e327
2017-07-07 01:32:49 +00:00
Treehugger Robot
7edc11830a Merge "Re-compute DX command if it changes for PDK." 2017-07-07 01:22:36 +00:00
Ivan Lozano
4a363734b3 Add integer_overflow sanitization build option.
Adds the SANITIZE_TARGET=integer_overflow build option to apply signed and
unsigned integer overflow sanitization globally. This implements the
Make side of the build option.

A LOCAL_SANITIZE_BLACKLIST variable is added to allow blacklists to be
defined in make files, mirroring similar functionality provided in Soong.

An additional build option is provided to control whether or not to run
in diagnostics mode, controlled by SANITIZE_TARGET_DIAG. This works the
same way that SANITIZE_TARGET does and currently only supports
'integer_overflow' as an option.

Bug: 30969751
Test: Building with and without the new flags, device boot-up, tested
various permutations of controlling the new flags from build files.

Change-Id: Iacc47e196f21aa1edff5b406bfbc564b5f4e42bd
2017-07-06 18:21:37 -07:00
Dan Willemsen
8533fa1b9d Fix install location for vendor tests
Bug: 63393698
Test: m -j hidl_test_client; apply; m -j hidl_test_client
Change-Id: Ia54a8d2aaedd63ce1d70944ee69fda3b9fe223a9
2017-07-06 17:46:17 -07:00
Bryan Eyler
d4794315ff Re-compute DX command if it changes for PDK.
Bug 62360631
Tested build of PDK.

Test: builds
Change-Id: I7cbd649a8a3ce4326e513d5a808b76fbb011d99e
Merged-In: I7cbd649a8a3ce4326e513d5a808b76fbb011d99e
(cherry picked from commit af4bde4239)
2017-07-06 16:22:01 -07:00
Colin Cross
a12d38a721 Increase max heap size for javac to 2GB.
Compiling Dialer requires increasing the javac heap size above
1GB, probably due to the extensive use of annotation processors.
Increase it to 2GB.

Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I4dd3759a98ea915469e69f563dc49be8a25d518e
Merged-In: I4dd3759a98ea915469e69f563dc49be8a25d518e
(cherry picked from commit 0e785c79b8)
2017-07-06 16:13:00 -07:00
Przemyslaw Szczepaniak
2e81b3c49f Enable stripping of java debug information when required.
We're removing LocalVariableType / LocalVariableType in order to
save space. Enabling stripping reduces AOSP  image size save
by ~12MB.

Bug: 38224820
Test: CtsLibcoreTestCases
Change-Id: I3168d73ec6825aa5879db7e1135d7ed61d488d72
2017-07-06 08:31:14 +00:00
Howard Chen
f07747f71f Merge "Add a make maco to convert string to upper case" am: 8eff2d7c8e am: fd380f20cb
am: 0b2aebab08

Change-Id: I50966ed3c8e3f6bee41484e2d7a77d5471f0bf89
2017-07-06 03:55:24 +00:00
Howard Chen
0b2aebab08 Merge "Add a make maco to convert string to upper case" am: 8eff2d7c8e
am: fd380f20cb

Change-Id: Id2f55d548088375eaf38f6b809be9e804adaf83b
2017-07-06 03:52:53 +00:00
Howard Chen
fd380f20cb Merge "Add a make maco to convert string to upper case"
am: 8eff2d7c8e

Change-Id: I86260216cea1c2a6d46599481e19e0063ae576a8
2017-07-06 03:50:54 +00:00
Howard Chen
8eff2d7c8e Merge "Add a make maco to convert string to upper case" 2017-07-06 03:46:07 +00:00
bohu
120c3f05aa emulator: get emulator booting am: d665b020f2
am: e9ba09af7a

Change-Id: Ib7c38e7c78890375e9a85513531679e0d9a21032
2017-07-06 02:33:06 +00:00
Android Build Merger (Role)
5fdfd05e04 Merge "emulator: get emulator booting am: d665b020f2 am: 0f4de2f8aa" into oc-dr1-dev-plus-aosp 2017-07-06 02:21:03 +00:00
bohu
6c3d307741 emulator: get emulator booting am: d665b020f2
am: 0f4de2f8aa

Change-Id: I7b953b80ce7ad1cd21d79dfcc0e5df24d1b4376f
2017-07-06 02:20:36 +00:00
bohu
0b737d3248 emulator: get emulator booting am: d665b020f2
am: 0f4de2f8aa

Change-Id: I5fcbc47de2c46dbc468139e95a626ad071a2e0a2
2017-07-06 02:19:53 +00:00
bohu
0f4de2f8aa emulator: get emulator booting
am: d665b020f2

Change-Id: Idf376eae7d42242f17fdef99ce0d6de9067a2236
2017-07-06 02:17:22 +00:00
bohu
e9ba09af7a emulator: get emulator booting
am: d665b020f2

Change-Id: I2d2399cca30f02b66dd243086839b35a336050bb
2017-07-06 02:17:22 +00:00
Bowgo Tsai
0c1721f5b5 Merge "Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39" into stage-aosp-master am: fd9315668e -s ours
am: 1c702ee273  -s ours

Change-Id: I43969fc5871a03bb293605e8ac7fc11f6afe878b
2017-07-06 01:11:14 +00:00
Bowgo Tsai
fcca0811ca Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39 am: 95202bcba6
am: 412138338e  -s ours

Change-Id: Ibc05db84f0678648058f4e6795bf548a8c0376d0
2017-07-06 01:10:56 +00:00
Bowgo Tsai
1c702ee273 Merge "Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39" into stage-aosp-master
am: fd9315668e  -s ours

Change-Id: Ib25c47f4e4761e861e11027b1e110a5bbb8feec0
2017-07-06 01:01:57 +00:00
Bowgo Tsai
412138338e Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39
am: 95202bcba6

Change-Id: I9b9a5faf158157fbb34d18c4e7107e137411634d
2017-07-06 01:00:41 +00:00
Android Build Merger (Role)
fd9315668e Merge "Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39" into stage-aosp-master 2017-07-06 00:58:34 +00:00
Bowgo Tsai
6138b22d35 Merge "Align size of vbmeta image to 4k boundary"
am: efb6fddf39

Change-Id: I1aac1bdccaa3a08fa86194184797a2875cb5b81c
2017-07-06 00:58:21 +00:00