Simran Basi
38c95e4d6d
Merge "device-tests & general-tests: build out zips." am: dd908dd925
...
am: 0aa305aacc
2017-03-17 17:53:20 +00:00
Simran Basi
0aa305aacc
Merge "device-tests & general-tests: build out zips."
...
am: dd908dd925
2017-03-17 17:50:23 +00:00
Treehugger Robot
dd908dd925
Merge "device-tests & general-tests: build out zips."
2017-03-17 17:45:05 +00:00
bohu
7a0f58cfd7
Merge "Emulator: Enable logcat -Q to run in emulator" am: 406d3b6df1 am: 5c8080cc18
...
am: 4e0937222d
2017-03-17 16:38:34 +00:00
bohu
4e0937222d
Merge "Emulator: Enable logcat -Q to run in emulator" am: 406d3b6df1
...
am: 5c8080cc18
2017-03-17 16:34:32 +00:00
bohu
5c8080cc18
Merge "Emulator: Enable logcat -Q to run in emulator"
...
am: 406d3b6df1
2017-03-17 16:30:33 +00:00
Treehugger Robot
406d3b6df1
Merge "Emulator: Enable logcat -Q to run in emulator"
2017-03-17 16:23:54 +00:00
Dan Willemsen
de4e71b27b
Revert "install *.so in different paths for their types"
...
This reverts commit 842a985f90
2017-03-16 16:54:40 -07:00
Tao Bao
c340b2e74f
releasetools: Add support for --override_timestamp. am: 9f884e6c55 am: 9ee7071553 am: d5de271e01 am: 839cdc66b1 am: 4b066f1dcc -s ours
...
am: 9db79477d5
2017-03-16 23:50:16 +00:00
Tao Bao
9db79477d5
releasetools: Add support for --override_timestamp. am: 9f884e6c55 am: 9ee7071553 am: d5de271e01 am: 839cdc66b1
...
am: 4b066f1dcc
2017-03-16 23:43:45 +00:00
Tao Bao
20e2ee2d22
releasetools: Add support for --override_timestamp. am: 9f884e6c55 am: 9ee7071553 am: d5de271e01 am: bd7cdf43e3 am: 912683668f am: c0413986fb
...
am: ae858a7899
2017-03-16 23:39:17 +00:00
Tao Bao
ae858a7899
releasetools: Add support for --override_timestamp. am: 9f884e6c55 am: 9ee7071553 am: d5de271e01 am: bd7cdf43e3 am: 912683668f
...
am: c0413986fb
2017-03-16 23:35:45 +00:00
Tao Bao
4b066f1dcc
releasetools: Add support for --override_timestamp. am: 9f884e6c55 am: 9ee7071553 am: d5de271e01
...
am: 839cdc66b1
2017-03-16 23:33:44 +00:00
Tao Bao
c0413986fb
releasetools: Add support for --override_timestamp. am: 9f884e6c55 am: 9ee7071553 am: d5de271e01 am: bd7cdf43e3
...
am: 912683668f
2017-03-16 23:31:45 +00:00
Tao Bao
912683668f
releasetools: Add support for --override_timestamp. am: 9f884e6c55 am: 9ee7071553 am: d5de271e01
...
am: bd7cdf43e3
2017-03-16 23:28:44 +00:00
Tao Bao
bd7cdf43e3
releasetools: Add support for --override_timestamp. am: 9f884e6c55 am: 9ee7071553
...
am: d5de271e01
2017-03-16 23:26:45 +00:00
Tao Bao
839cdc66b1
releasetools: Add support for --override_timestamp. am: 9f884e6c55 am: 9ee7071553
...
am: d5de271e01
2017-03-16 23:26:44 +00:00
Tao Bao
d5de271e01
releasetools: Add support for --override_timestamp. am: 9f884e6c55
...
am: 9ee7071553
2017-03-16 23:24:13 +00:00
Tao Bao
9ee7071553
releasetools: Add support for --override_timestamp.
...
am: 9f884e6c55
2017-03-16 23:21:13 +00:00
Tao Bao
9deb61d782
Merge "releasetools: Remove a dead line." am: 83a6b953c9 am: 9a7201408f
...
am: 84161e9820
2017-03-16 22:44:10 +00:00
Tao Bao
84161e9820
Merge "releasetools: Remove a dead line." am: 83a6b953c9
...
am: 9a7201408f
2017-03-16 22:39:09 +00:00
Tao Bao
9a7201408f
Merge "releasetools: Remove a dead line."
...
am: 83a6b953c9
2017-03-16 22:32:40 +00:00
Tao Bao
83a6b953c9
Merge "releasetools: Remove a dead line."
2017-03-16 22:24:25 +00:00
Adam Lesinski
15c6791d76
Merge "Add LOCAL_ASSET_DIR support (-A) to aapt2"
2017-03-16 21:56:23 +00:00
Michael Wright
7d4944da37
Remove inputflinger from the builds.
...
Some day... some day...
Test: builds
Change-Id: I1a0390c7bfa15f7590a869ba5e12e112ec510602
2017-03-16 14:38:36 -07:00
Lingfeng Yang
ed82d0892d
Merge "Add hwcomposer to emulator image build"
2017-03-16 20:45:28 +00:00
Chong Zhang
ad3bb1b0f2
Add clear key CAS plugin (libclearkeycasplugin.so) to build.
...
bug: 22804304
Change-Id: Ie1bbe563740d7002f0fc082b4e10ca04d80c1277
2017-03-16 12:38:01 -07:00
Lingfeng Yang
ad1a1ac03f
Add hwcomposer to emulator image build
...
Change-Id: Ifa366f54ab5a380f71171b953168c597b2c5603f
2017-03-16 12:26:56 -07:00
Tao Bao
2f80e83e98
releasetools: Remove a dead line.
...
system_root_image has been dead since commit
2ce63edab7
2017-03-16 11:59:24 -07:00
Tianjie Xu
5aa9a7b6b6
Merge "Provide more info for bsdiff/imgdiff exceptions." am: 53ba93d615 am: e742de1c4a
...
am: a9453d915d
2017-03-16 18:57:25 +00:00
Tianjie Xu
a9453d915d
Merge "Provide more info for bsdiff/imgdiff exceptions." am: 53ba93d615
...
am: e742de1c4a
2017-03-16 18:54:55 +00:00
Tianjie Xu
e742de1c4a
Merge "Provide more info for bsdiff/imgdiff exceptions."
...
am: 53ba93d615
2017-03-16 18:46:24 +00:00
Tao Bao
c66d5d674f
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef am: e7847765a6 am: a7dcbfb2d8 am: 712bf7d750 am: 6ea73e3566 am: 58bb2216da
...
am: c9ed71221b
2017-03-16 18:46:24 +00:00
Tao Bao
70725df24e
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef am: e7847765a6 am: a7dcbfb2d8 am: 00f2147e70 am: aaabaf74d6 -s ours
...
am: 3ebe86b6a8
2017-03-16 18:43:52 +00:00
Tianjie Xu
53ba93d615
Merge "Provide more info for bsdiff/imgdiff exceptions."
2017-03-16 18:43:28 +00:00
Tao Bao
c9ed71221b
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef am: e7847765a6 am: a7dcbfb2d8 am: 712bf7d750 am: 6ea73e3566
...
am: 58bb2216da
2017-03-16 18:43:25 +00:00
Tao Bao
58bb2216da
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef am: e7847765a6 am: a7dcbfb2d8 am: 712bf7d750
...
am: 6ea73e3566
2017-03-16 18:38:23 +00:00
Tao Bao
3ebe86b6a8
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef am: e7847765a6 am: a7dcbfb2d8 am: 00f2147e70
...
am: aaabaf74d6
2017-03-16 18:38:23 +00:00
Tao Bao
aaabaf74d6
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef am: e7847765a6 am: a7dcbfb2d8
...
am: 00f2147e70
2017-03-16 18:35:24 +00:00
Tao Bao
6ea73e3566
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef am: e7847765a6 am: a7dcbfb2d8
...
am: 712bf7d750
2017-03-16 18:35:24 +00:00
Tao Bao
00f2147e70
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef am: e7847765a6
...
am: a7dcbfb2d8
2017-03-16 18:30:53 +00:00
Tao Bao
712bf7d750
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef am: e7847765a6
...
am: a7dcbfb2d8
2017-03-16 18:30:52 +00:00
Tao Bao
9f884e6c55
releasetools: Add support for --override_timestamp.
...
We use the timestamps in builds to determine a downgrade, which might
not be always the truth. For examples, two builds cut from different
branches may carry timestamps in a reverse order. An incremental package
won't be able to be pushed nor applied, based on the timestamp
comparison.
We used to handle such a case with manual work, by setting the
post-timestamp to (pre-timestamp + 1) in the package metadata. This CL
automates the process by adding a new flag --override_timestamp.
Note that it doesn't change anything in the installed image, but only
affects the assertions for pushing / installing the package.
With the change in this CL:
- If it's a downgrade without any extra flag, fail the package
generation (we only print warnings prior to this CL);
- If it's a downgrade with --downgrade flag, generate a downgrade
package with forced data wipe (same as before);
- If it's a downgrade with --override_timestamp, generate a normal
incremental with hacked timestamp (pre-timestamp + 1) (new in this CL
to avoid the manual change);
- If it's not a downgrade but with any of the above two flags specified,
fail the package generation.
Bug: 33744169
Test: Generate an incremental from builds with reversed timestamps.
Change-Id: I8b187d32708b4a7c3e20f8c6adb8f9527b73b965
Merged-In: I8b187d32708b4a7c3e20f8c6adb8f9527b73b965
(cherry picked from commit 3e6161a3b3
2017-03-16 11:26:06 -07:00
Tao Bao
a7dcbfb2d8
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef
...
am: e7847765a6
2017-03-16 18:25:54 +00:00
Tao Bao
e7847765a6
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev
...
am: 5a4508bcef
2017-03-16 18:22:54 +00:00
Tao Bao
5a4508bcef
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev
2017-03-16 18:19:39 +00:00
Adam Seaton
3480f56a4c
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours am: 1b9f1e8156 -s ours am: b3b5777fff am: bff6f7d991 -s ours am: b65c93dbcf am: 3ded290e7d am: 2996209f6f am: b6279913b3 -s ours am: 8d6607c91e am: b9a68b56fc am: acb61d098f -s ours am: 8873aa245d -s ours am: b1f03425ba -s ours am: 3c08a84090 -s ours
...
am: f8c3d28bbd
2017-03-16 17:16:55 +00:00
Adam Seaton
9cc3e91604
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302 -s ours am: 5e0c5f0263 -s ours am: 8edd5d7e30 am: 5af5f2c46f -s ours am: e1d7ca1ec7 am: 35c6a6d4a3 am: 099df1bb0d am: c1d127aa41 -s ours am: 635c2bd638 am: 0dd56e764d am: ef22893c43 -s ours am: 003c280d29 -s ours am: 16d3b7571a -s ours am: 1a431f8fe6 -s ours
...
am: ab59507287
2017-03-16 17:16:47 +00:00
Adam Seaton
13495f6fca
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours am: 1b9f1e8156 -s ours am: b3b5777fff am: bff6f7d991 -s ours am: b65c93dbcf am: 3ded290e7d am: 2996209f6f am: b6279913b3 -s ours am: 8d6607c91e am: b9a68b56fc am: acb61d098f am: 7e925268af am: fa06ff812b
...
am: 3d9fad510d
2017-03-16 17:14:22 +00:00
Adam Seaton
f8c3d28bbd
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours am: 1b9f1e8156 -s ours am: b3b5777fff am: bff6f7d991 -s ours am: b65c93dbcf am: 3ded290e7d am: 2996209f6f am: b6279913b3 -s ours am: 8d6607c91e am: b9a68b56fc am: acb61d098f -s ours am: 8873aa245d -s ours am: b1f03425ba -s ours
...
am: 3c08a84090
2017-03-16 17:14:21 +00:00
