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
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
smain@google.com
b5c0ce5e70
add studio survey button to header. am: 075aad742a
am: 1e5a77656d
am: 5b21ac836b
am: 0fbdef286c
...
am: eeb1c898b9
* commit 'eeb1c898b966f39030b4bb753ef3298ff67c4809':
add studio survey button to header.
Change-Id: I01690f8bce63f36e7d4b9340949a6cfeb22508a0
2016-04-29 16:42:33 +00:00
smain@google.com
eeb1c898b9
add studio survey button to header. am: 075aad742a
am: 1e5a77656d
am: 5b21ac836b
...
am: 0fbdef286c
* commit '0fbdef286c3d75c46f6cfe8222a02f23fe71eada':
add studio survey button to header.
Change-Id: I0c30340254f078958a4d87a4a6368673fb8978d2
2016-04-29 16:40:05 +00:00
smain@google.com
6de605ad49
add studio survey button to header. am: f887aec708
am: cc81c16143
am: ec1a297d39
...
am: 16f9ebf7c5
* commit '16f9ebf7c599b2d532a44c5c6b83490d7b15a6a8':
add studio survey button to header.
Change-Id: Id81635bcdb37131026dde995be9abdb18e17a55a
2016-04-29 16:40:05 +00:00
Amanda Kassay
c6d9cdce8d
Adding top category, subcategory and book path detection for go/libraries
...
Fix for sdk download form b/28425669
Fix for missing 'Develop' text in left nav on preview pages b/28450858
Change-Id: I0b7a5dc26dc3cb4be58aecbbad41cdf62e0331ba
2016-04-29 16:38:37 +00:00
smain@google.com
16f9ebf7c5
add studio survey button to header. am: f887aec708
am: cc81c16143
...
am: ec1a297d39
* commit 'ec1a297d39ee983dd82353ffc53428eb6da09f0c':
add studio survey button to header.
Change-Id: I4608a02f570358c8efaec0568517f1923f59e65e
2016-04-29 16:37:24 +00:00
smain@google.com
0fbdef286c
add studio survey button to header. am: 075aad742a
am: 1e5a77656d
...
am: 5b21ac836b
* commit '5b21ac836b99141e460b5426c8781dddc9987439':
add studio survey button to header.
Change-Id: Iaff1610a9fdc0eb64cabb09bd151a81896d2e065
2016-04-29 16:37:23 +00:00
smain@google.com
5b21ac836b
add studio survey button to header. am: 075aad742a
...
am: 1e5a77656d
* commit '1e5a77656d6edc39f5cc61e118edd78a0c99b1d8':
add studio survey button to header.
Change-Id: I5deb51962a013dbc895c87a64be2f2c7c0a9ca4e
2016-04-29 16:34:58 +00:00
smain@google.com
ec1a297d39
add studio survey button to header. am: f887aec708
...
am: cc81c16143
* commit 'cc81c161431ac0bdbd460dd0ed4a56dce2a4c2b3':
add studio survey button to header.
Change-Id: Idd83cccf03d06223a625e3ae9bf66eb39c9dfd66
2016-04-29 16:34:58 +00:00
smain@google.com
1e5a77656d
add studio survey button to header.
...
am: 075aad742a
* commit '075aad742a9d12d43435e7b909a6a999c1050f6c':
add studio survey button to header.
Change-Id: I82c20a411335126acfcca8773aab51eb142b213d
2016-04-29 16:32:31 +00:00
smain@google.com
cc81c16143
add studio survey button to header.
...
am: f887aec708
* commit 'f887aec708426ca4f6dbb1def25b006813979e42':
add studio survey button to header.
Change-Id: I7b674d935116978bcd6a1c0b11ad5f54bd950f74
2016-04-29 16:32:31 +00:00
smain@google.com
075aad742a
add studio survey button to header.
...
adds JS to save in local storage whether the user already clicked the
survey. The button appears only if they have not clicked it yet.
Change-Id: Ifc5a100a8bb8505c47d95c7cfb5aaa8cdbfdc8bd
(cherry picked from commit f887aec708
)
2016-04-29 16:28:40 +00:00
smain@google.com
f887aec708
add studio survey button to header.
...
adds JS to save in local storage whether the user already clicked the
survey. The button appears only if they have not clicked it yet.
Change-Id: Ifc5a100a8bb8505c47d95c7cfb5aaa8cdbfdc8bd
2016-04-28 17:34:41 -07:00
Adam Lesinski
8d1e2fdcba
Call aapt2 link with argument-list
...
Also follow symbolic links when looking for assets.
Bug:22775504
Change-Id: I971e23505f766a2192469df1aad55bc20c46f618
2016-04-28 15:10:18 -07:00
Adam Lesinski
9c5f7a462c
Merge "Revert "Call aapt2 link with argument-list"" into nyc-dev
...
am: 6c078e0522
* commit '6c078e0522daafbdb5b2635baa510c2863bde2bb':
Revert "Call aapt2 link with argument-list"
Change-Id: I36d1080067620f991766a751830cac885fd1dc48
2016-04-28 20:15:41 +00:00
Adam Lesinski
6c078e0522
Merge "Revert "Call aapt2 link with argument-list"" into nyc-dev
2016-04-28 20:10:17 +00:00
Adam Lesinski
4c44d94999
Revert "Call aapt2 link with argument-list"
...
This reverts commit d4d6a50fbb
.
Change-Id: If84ad9921eb51ae16eae2be3cf4b2ee86b31ce80
2016-04-28 20:06:53 +00:00