Commit graph

29090 commits

Author SHA1 Message Date
Todd Kennedy
0451b2f946 Merge "Revert "Add shim app for CTS testing"" into nyc-dev
am: 878775fd75

* commit '878775fd750d7164bd0920b4b94b59e0edab8ed3':
  Revert "Add shim app for CTS testing"

Change-Id: Ie5df8c8ea8785b8562866522f6d13e54b5ce52d5
2016-05-03 00:08:55 +00:00
Todd Kennedy
878775fd75 Merge "Revert "Add shim app for CTS testing"" into nyc-dev 2016-05-02 23:56:37 +00:00
Todd Kennedy
31003c48c1 Revert "Add shim app for CTS testing"
Build errors when trying to dex2oat the CtsShim prebuilt even though it's marked with "hasCode=false".

This reverts commit d987a11126.

Change-Id: If47b3bcd4c727da7acd9068c02f8fb671ed0ae84
2016-05-02 23:54:08 +00:00
Todd Kennedy
46785aea64 Merge "Add shim app for CTS testing" into nyc-dev
am: 6d0c367a64

* commit '6d0c367a64b91cdf8dc6bc25605bff7b13f35a35':
  Add shim app for CTS testing

Change-Id: Ic6342cd60478364533514b576ccc86b6db7ab695
2016-05-02 22:59:21 +00:00
Todd Kennedy
6d0c367a64 Merge "Add shim app for CTS testing" into nyc-dev 2016-05-02 22:49:55 +00:00
smain@google.com
018351489e resolve merge conflicts of bfa0fff to nyc-dev
am: 788f98ae22

* commit '788f98ae2249e266014b5ab98816f94332540720':
  remove the sdk download tables. No longer used now that downloads are in the /studio docs.

Change-Id: I14676cacd30bbcbaae3a9aec1a9798e5aed6a27e
2016-05-02 22:45:21 +00:00
smain@google.com
788f98ae22 resolve merge conflicts of bfa0fff to nyc-dev
Change-Id: Ibcb549cbb578bb1aa2347a63df0420d65272586e
2016-05-02 15:30:44 -07:00
smain@google.com
bfa0fffc9f remove the sdk download tables. No longer used now that downloads are in the /studio docs. am: 6f0ed9bddd
am: 56c09c5e6e

* commit '56c09c5e6e9095c9a7b3e4387a81ce1fd2ea1145':
  remove the sdk download tables. No longer used now that downloads are in the /studio docs.

Change-Id: I362d830a6ecbe48e99cd0cf77d6d52136fa15a94
2016-05-02 21:41:35 +00:00
smain@google.com
56c09c5e6e remove the sdk download tables. No longer used now that downloads are in the /studio docs.
am: 6f0ed9bddd

* commit '6f0ed9bddd6457b358f662a2d1657686f633f903':
  remove the sdk download tables. No longer used now that downloads are in the /studio docs.

Change-Id: I64df6648f49943177192ea7cd27139b9b21d29ea
2016-05-02 21:36:38 +00:00
smain@google.com
6f0ed9bddd remove the sdk download tables. No longer used now that downloads are in the /studio docs.
Change-Id: I19524f58c2bcbfc5abdc79c60b16a259b526801b
2016-05-02 14:19:17 -07:00
Igor Murashkin
6de229c0c9 Merge "old-cts: Add testng and libcoreoj test support" am: 11821a1e1e
am: d581330855  -s ours

* commit 'd5813308552e472c708d7b02a8f63d63c0f0a911':
  old-cts: Add testng and libcoreoj test support

Change-Id: I005beea197cef87859d8f78b880c3bbad8e61f2d
2016-05-02 21:05:13 +00:00
Igor Murashkin
d581330855 Merge "old-cts: Add testng and libcoreoj test support"
am: 11821a1e1e

* commit '11821a1e1e1360ceb1ad83f55715d7415c385633':
  old-cts: Add testng and libcoreoj test support

Change-Id: I0f838aebab9aea750217e9351e03f19410ba049c
2016-05-02 20:55:54 +00:00
Igor Murashkin
11821a1e1e Merge "old-cts: Add testng and libcoreoj test support" 2016-05-02 20:40:09 +00:00
Felipe Leme
b382c63a61 Merge "Added bugreportz binary." into nyc-dev
am: 386df80e85

* commit '386df80e85e2098a32c41fee4b8b379991b360b8':
  Added bugreportz binary.

Change-Id: I25aa201a3a7a77771cb57f3eb3ceff435dc1cd15
2016-05-02 20:05:29 +00:00
TreeHugger Robot
386df80e85 Merge "Added bugreportz binary." into nyc-dev 2016-05-02 19:54:50 +00:00
Shinichiro Hamaji
6e92d40a72 Merge "Initialize an uninitialized field in ijar" am: a6da20e2d2
am: c6a3413fa7

* commit 'c6a3413fa78f71de68d8fed2157ddad28d6478fa':
  Initialize an uninitialized field in ijar

Change-Id: I039a3c4b1ccb7439af698e3c3e88a043844a6b39
2016-05-02 19:15:01 +00:00
Shinichiro Hamaji
c6a3413fa7 Merge "Initialize an uninitialized field in ijar"
am: a6da20e2d2

* commit 'a6da20e2d29b3bbde0b1b9101727cd6ea8b9c9c4':
  Initialize an uninitialized field in ijar

Change-Id: Iee38d8d3eb2ff20d8e4d1cf876e83bfdac5e3391
2016-05-02 19:10:43 +00:00
Shinichiro Hamaji
a6da20e2d2 Merge "Initialize an uninitialized field in ijar" 2016-05-02 19:00:43 +00:00
Chih-hung Hsieh
62ee02f772 Merge "Fix google-explicit-constructor warnings." am: 169cb4b68c
am: 6b63c3b696

* commit '6b63c3b6968a4ca3e4d055b69a67b74082d79e99':
  Fix google-explicit-constructor warnings.

Change-Id: I297982955eafe459a1f9c96b6b401e16aff0fd04
2016-05-02 18:31:42 +00:00
Chih-Hung Hsieh
6b63c3b696 Merge "Fix google-explicit-constructor warnings."
am: 169cb4b68c

* commit '169cb4b68c6e69e1997cc5e2f9e555b010127bb5':
  Fix google-explicit-constructor warnings.

Change-Id: Iafe8e50822c55d80227745f4823b5cbe97039944
2016-05-02 18:27:24 +00:00
Shinichiro Hamaji
d6c694b302 Initialize an uninitialized field in ijar
The upstream patch was merged:
https://github.com/bazelbuild/bazel/commit/a5004430338bc72817c7

Bug: 28347190
Change-Id: I9b8b9bc830bd16299b94e8c92c22dba8aa36affb
2016-05-03 03:19:23 +09:00
Felipe Leme
90ab323be2 Added bugreportz binary.
BUG: 28479946
Change-Id: Ic0d1b6598867ccbbc65f3fdc0d32cac7c53128a3
2016-05-02 11:18:07 -07:00
Chih-hung Hsieh
169cb4b68c Merge "Fix google-explicit-constructor warnings." 2016-05-02 18:08:16 +00:00
Tao Bao
be9457cad2 Pack base_fs files into target_files.zip.
am: f54216f292

* commit 'f54216f29238a67aad1199a0e85d09e443740bf0':
  Pack base_fs files into target_files.zip.

Change-Id: Ia68c3a707def1865151f071ca33a3bdc513f9045
2016-05-02 16:45:31 +00:00
Tao Bao
f54216f292 Pack base_fs files into target_files.zip.
Pack the base_fs files ({system,vendor}.map) into target_files.zip,
which would be needed when rebuilding the images at signing.

Reset the base_fs paths to point to the files in META/.

Also add blk_alloc_to_base_fs into otatools.zip.

Bug: 27698960
Change-Id: If4eb274b3f3d839c4365624f46f0dc89bd2fa440
2016-04-30 23:56:10 -07:00
Chih-hung Hsieh
e49c261cb4 Merge "Suppress google-* checks in vendor modules." am: f2592e192d
am: 336e44fc3f

* commit '336e44fc3f832224e687ae3755fe1d2610800ce3':
  Suppress google-* checks in vendor modules.

Change-Id: I6a60ec1ef74a7e83368e06139984d7c6f7bfc5ba
2016-04-30 00:47:06 +00:00
Chih-Hung Hsieh
336e44fc3f Merge "Suppress google-* checks in vendor modules."
am: f2592e192d

* commit 'f2592e192da6fcea5233b073149751c9ee687ab9':
  Suppress google-* checks in vendor modules.

Change-Id: Id501346744dd238120c428cdf5ebb9815a438bd2
2016-04-30 00:44:49 +00:00
Chih-hung Hsieh
f2592e192d Merge "Suppress google-* checks in vendor modules." 2016-04-30 00:38:35 +00:00
Elliot Waite
ec65dc30f6 Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs am: dc55c97296 am: 16c30a64a6 am: f1929d419b
am: 5eee82cf1c

* commit '5eee82cf1c196b6a60032590a14821e904c47c81':
  Generate reference nav to _book.yaml for devsite builds.

Change-Id: Ic3010dd85ec09f47f1a0e9f7d76c7c3b70f70ac3
2016-04-29 23:56:23 +00:00
Dirk Dougherty
5eee82cf1c Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs am: dc55c97296 am: 16c30a64a6
am: f1929d419b

* commit 'f1929d419b5ac003d50e4a2efc18bbeadf81245b':
  Generate reference nav to _book.yaml for devsite builds.

Change-Id: Ifda2c3062588bfb8205e59dfcc3d909a62334ddc
2016-04-29 23:54:12 +00:00
Elliot Waite
f1929d419b Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs am: dc55c97296
am: 16c30a64a6

* commit '16c30a64a66aa141822df3d77277050cf4271524':
  Generate reference nav to _book.yaml for devsite builds.

Change-Id: I905d220aef6137863a16556ed24fbf6d14788f7d
2016-04-29 23:52:00 +00:00
Dirk Dougherty
16c30a64a6 Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs
am: dc55c97296

* commit 'dc55c97296b0cc7d50d56013d417444c9b012ce2':
  Generate reference nav to _book.yaml for devsite builds.

Change-Id: Id90b7d082e780530943f2a9e25f42edbc634658d
2016-04-29 23:49:43 +00:00
Elliot Waite
dc55c97296 Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs 2016-04-29 23:42:15 +00:00
Dirk Dougherty
ba8230849d Generate reference nav to _book.yaml for devsite builds.
Change-Id: Iea0e1031b0d757664b8994096010dd92b98ca883
2016-04-29 16:25:21 -07:00
Chih-Hung Hsieh
30f86e4ab8 Suppress google-* checks in vendor modules.
Too many warnings in vendor code that we cannot fix yet.

Bug: http://b/27779618
Change-Id: I8b65b1fd55c4e4d0dadf0617ab25962809237309
2016-04-29 15:16:59 -07:00
Adam Lesinski
54d4d765ba Merge "Call aapt2 link with argument-list" into nyc-dev
am: dfd6197f51

* commit 'dfd6197f5173b957b6e41a83df66d04068fa6517':
  Call aapt2 link with argument-list

Change-Id: I34e64e07736d428ca87044ac07a952be50531464
2016-04-29 22:13:20 +00:00
Adam Lesinski
dfd6197f51 Merge "Call aapt2 link with argument-list" into nyc-dev 2016-04-29 22:09:01 +00:00
Chih-Hung Hsieh
1df33b78aa Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: I72bdd1df09cea91743aa89dab4cb0b9db2657e2d
2016-04-29 14:10:10 -07:00
Todd Kennedy
a9ce97d223 Merge "Only align when necessary" into nyc-dev
am: 1ccfe52630

* commit '1ccfe5263008991aeff10964da3bdc6c2c1c1d06':
  Only align when necessary

Change-Id: I2452df91a9c97a0b7d2d182165384d63ce040a09
2016-04-29 21:02:31 +00:00
Todd Kennedy
1ccfe52630 Merge "Only align when necessary" into nyc-dev 2016-04-29 20:59:04 +00:00
Todd Kennedy
3f18099610 Only align when necessary
Bug: 27887819
Change-Id: Ie8b5ca31cc1c08943588fc6039d75190ff7eeb8b
2016-04-29 13:58:13 -07:00
Alex Klyubin
2a10307455 Merge "zipalign supports -p also when checking alignment." am: 401f8b953f
am: b6587f9895

* commit 'b6587f9895e61751e9a85faa3ab7ace753dcf07e':
  zipalign supports -p also when checking alignment.

Change-Id: I11207ce34a3f2d3a5c55df4ac67c92c7032e5b68
2016-04-29 20:35:07 +00:00
Alex Klyubin
b6587f9895 Merge "zipalign supports -p also when checking alignment."
am: 401f8b953f

* commit '401f8b953fff2f510ef7c118cfef503981ab5be6':
  zipalign supports -p also when checking alignment.

Change-Id: I54d1a931f108ab80fafaf3f13a34d924175eb3a9
2016-04-29 20:32:47 +00:00
Alex Klyubin
401f8b953f Merge "zipalign supports -p also when checking alignment." 2016-04-29 20:26:17 +00:00
Alex Klyubin
01d6b59dcf zipalign supports -p also when checking alignment.
This updates the usage banner of zipalign to state that the -p switch
is supported in check alignment mode.

Change-Id: I119026b0e09e5a2528646e88a9b58dbb79c0c17c
2016-04-29 12:32:17 -07:00
Amanda Kassay
21291ad01b Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs am: 5b005e1ded am: e0b5cb8f29 am: 532e0accaa
am: aa63361bde

* commit 'aa63361bdee4a51bde3c870d5a55f09d7fb4e79e':
  Adding top category, subcategory and book path detection for go/libraries

Change-Id: I019a07b0127f74fc4dde069092a18112eb2a0fa5
2016-04-29 19:00:59 +00:00
Amanda Kassay
aa63361bde Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs am: 5b005e1ded am: e0b5cb8f29
am: 532e0accaa

* commit '532e0accaa91468550ce0ddc375629618e8873c2':
  Adding top category, subcategory and book path detection for go/libraries

Change-Id: I1264c52ce1a3329ee54565ba14a412144d229647
2016-04-29 18:58:40 +00:00
Amanda Kassay
532e0accaa Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs am: 5b005e1ded
am: e0b5cb8f29

* commit 'e0b5cb8f297c24a58382baa41d006783c61afd35':
  Adding top category, subcategory and book path detection for go/libraries

Change-Id: I2132c0e0e52a0659874e495ac852e037ada17036
2016-04-29 18:56:25 +00:00
Amanda Kassay
e0b5cb8f29 Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs
am: 5b005e1ded

* commit '5b005e1ded3a7c857fa326811e4cc197f394dab3':
  Adding top category, subcategory and book path detection for go/libraries

Change-Id: Id9274c4d464a42f54f5e6c53ede396e7060e773e
2016-04-29 18:54:12 +00:00
Amanda Kassay
5b005e1ded Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs 2016-04-29 18:44:25 +00:00