Bill Yi
a04a15b262
Merge commit '18d9bd19a4fd75fc7951b43ba01167838f8bb2ac' into HEAD
2015-08-27 15:09:29 -07:00
Tao Bao
4988f18b1f
am 6458fd96
: Merge "rangelib.py: Fix the bug in monotonic check."
...
* commit '6458fd96d5d0cd3b54a02a5f9c276f49e566cb53':
rangelib.py: Fix the bug in monotonic check.
2015-08-27 20:44:35 +00:00
Tao Bao
6458fd96d5
Merge "rangelib.py: Fix the bug in monotonic check."
2015-08-27 19:16:06 +00:00
Tao Bao
575643a85d
am 14342066
: Merge "Add unit tests for rangelib.py."
...
* commit '14342066dbaec25593c12fdba5396d4ca9cad841':
Add unit tests for rangelib.py.
2015-08-27 05:23:08 +00:00
Tao Bao
e8f756137c
rangelib.py: Fix the bug in monotonic check.
...
RangeSet("2-10").monotonic gives a wrong result of "False". Fix the bug
and add more tests into test_rangelib.py.
Change-Id: I04780571b45ecafd34040f405756b9745a9e21a5
2015-08-26 21:16:43 -07:00
Ying Wang
18d9bd19a4
am 4fc14679
: am fc168f84
: resolved conflicts for merge of 1a8c6567
to lmp-mr1-ub-dev
...
* commit '4fc1467949aaf9e6a49a6771ed996e3c2c702314':
Don't fail build of otatools if there are no device certificates
2015-08-27 01:38:15 +00:00
Ying Wang
6b174a6c25
am 8f7c08ed
: am 1e120181
: am 473b6a5f
: am fc028e59
: Dist the otatools package.
...
* commit '8f7c08ed622d733c0997324d5b0464ba7e57c1fa':
Dist the otatools package.
2015-08-27 01:38:14 +00:00
Ying Wang
4fc1467949
am fc168f84
: resolved conflicts for merge of 1a8c6567
to lmp-mr1-ub-dev
...
* commit 'fc168f84695f492f2ad0eed3063145f425bebf45':
Don't fail build of otatools if there are no device certificates
2015-08-27 01:33:15 +00:00
Ying Wang
8f7c08ed62
am 1e120181
: am 473b6a5f
: am fc028e59
: Dist the otatools package.
...
* commit '1e120181f0a9240eca61dface4fb4530bf2594ab':
Dist the otatools package.
2015-08-27 01:27:37 +00:00
Ying Wang
fc168f8469
resolved conflicts for merge of 1a8c6567
to lmp-mr1-ub-dev
...
Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b
2015-08-26 17:03:18 -07:00
Tao Bao
14342066db
Merge "Add unit tests for rangelib.py."
2015-08-26 23:26:54 +00:00
Tao Bao
873a15e267
Add unit tests for rangelib.py.
...
Separate the test cases in rangelib.py comments into a python unittest
file.
To invoke:
$ python -m unittest test_rangelib
Change-Id: I59e4ce0aaccc83bcbb42fee15775683dcd559d99
2015-08-26 16:13:18 -07:00
Ying Wang
1e120181f0
am 473b6a5f
: am fc028e59
: Dist the otatools package.
...
* commit '473b6a5f2b00f941acb08b5c3df59cbbdf647609':
Dist the otatools package.
2015-08-26 20:17:16 +00:00
Tao Bao
8b528fc3ef
am 68319cdf
: am 95708eea
: Merge "Split large files for BBOTA v3."
...
* commit '68319cdf4762c7c48cff68ede2b7f4bc267db735':
Split large files for BBOTA v3.
2015-08-26 19:55:20 +00:00
Tao Bao
68319cdf47
am 95708eea
: Merge "Split large files for BBOTA v3."
...
* commit '95708eea4e50e9048bad13d129aa2f818b808ea8':
Split large files for BBOTA v3.
2015-08-26 19:46:39 +00:00
Tao Bao
95708eea4e
Merge "Split large files for BBOTA v3."
2015-08-26 19:39:31 +00:00
Tao Bao
9a5caf2c30
Split large files for BBOTA v3.
...
For BBOTA v3, we need to stash source blocks to support resumable
feature. However, with the growth of file size and the shrink of the
cache size, source blocks that represent a file are too large to be
stashed as a whole. CL in [1] solves the issue by replacing the diff
command with a "new" command. However, it may increase the generated
package size substantially (e.g. from ~100MB to ~400MB).
With this CL, if a file spans too many blocks, we split it into smaller
pieces by generating multiple commands. For the same case above, it
reduces the package size to ~150MB.
One potential downside is that after splitting, files like .jar,
.apk and .zip can no longer use imgdiff. We may lose the potential
benefit of using imgdiff for patch size reduction.
[1] commit 82c47981bd
Bug: 22430577
Change-Id: I5684fab0ac41c8d94fe18f52a34cef77e06f741c
2015-08-26 10:50:11 -07:00
Claes Elgemark
1a8c656704
am 8d771971
: Don\'t fail build of otatools if there are no device certificates
...
* commit '8d771971212069f77851163f437c782f581bf6db':
Don't fail build of otatools if there are no device certificates
2015-08-26 17:14:49 +00:00
Claes Elgemark
8d77197121
Don't fail build of otatools if there are no device certificates
...
Bug: 23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
2015-08-26 10:07:16 -07:00
Bart Sears
4535d7cb34
am c69aa42b
: Merge "Set the Security Patch level for MNC" into mnc-dev
...
* commit 'c69aa42b4331569814d23336412e6754a0495d65':
Set the Security Patch level for MNC
2015-08-26 03:47:52 +00:00
Bart Sears
c69aa42b43
Merge "Set the Security Patch level for MNC" into mnc-dev
2015-08-26 03:40:38 +00:00
Tao Bao
967b52fb0b
am afc5ab39
: am c6e087ad
: resolved conflicts for merge of 2bcfbe7e
to lmp-mr1-ub-dev
...
* commit 'afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825':
add otatools-package target
2015-08-25 23:35:45 +00:00
Tao Bao
afc5ab39d8
am c6e087ad
: resolved conflicts for merge of 2bcfbe7e
to lmp-mr1-ub-dev
...
* commit 'c6e087adc420ca08bfea8613c07aa51e1b4a2e3e':
add otatools-package target
2015-08-25 23:30:14 +00:00
Tao Bao
c6e087adc4
resolved conflicts for merge of 2bcfbe7e
to lmp-mr1-ub-dev
...
Change-Id: Ia53581aee207b0a24807767d7e80959a4fc9aff3
2015-08-25 16:18:01 -07:00
Nick Kralevich
64e4d8a211
am 35a075db
: am 36d91b53
: Merge "Only allow toolbox exec where /system exec was already allowed."
...
* commit '35a075db60bc5553b57ef3311b9643d3b04ea7da':
Only allow toolbox exec where /system exec was already allowed.
2015-08-25 22:53:03 +00:00
Nick Kralevich
35a075db60
am 36d91b53
: Merge "Only allow toolbox exec where /system exec was already allowed."
...
* commit '36d91b5352035bf5192856b849ddec607ce15b23':
Only allow toolbox exec where /system exec was already allowed.
2015-08-25 22:47:48 +00:00
Nick Kralevich
36d91b5352
Merge "Only allow toolbox exec where /system exec was already allowed."
2015-08-25 22:41:57 +00:00
Konstantinos Menychtas
d2524d00c2
am ca19158e
: am e9a8f465
: (-s ours) resolved conflicts for merge of 0287a8f6
to lmp-mr1-ub-dev
...
* commit 'ca19158e034d6e0f5a605698c0f303893a2b9248':
Increasing all emulator system image sizes
2015-08-25 18:30:57 +00:00
Konstantinos Menychtas
ca19158e03
am e9a8f465
: (-s ours) resolved conflicts for merge of 0287a8f6
to lmp-mr1-ub-dev
...
* commit 'e9a8f465859137ba37786031b804864205900cb4':
Increasing all emulator system image sizes
2015-08-25 18:22:28 +00:00
Ying Wang
473b6a5f2b
am fc028e59
: Dist the otatools package.
...
* commit 'fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd':
Dist the otatools package.
2015-08-25 18:21:13 +00:00
Ying Wang
fc028e59c2
Dist the otatools package.
...
Bug: 23495952
(cherry picked from commit 267e957373
)
Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
2015-08-25 11:13:56 -07:00
Ying Wang
c9343c0bc3
am cf129c53
: am a7eaf450
: Merge "Dist the otatools package."
...
* commit 'cf129c538266cdc5d185a945218e7f76aa22ca27':
Dist the otatools package.
2015-08-25 17:27:26 +00:00
Konstantinos Menychtas
e9a8f46585
resolved conflicts for merge of 0287a8f6
to lmp-mr1-ub-dev
...
Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5
2015-08-25 17:26:22 +00:00
Ying Wang
cf129c5382
am a7eaf450
: Merge "Dist the otatools package."
...
* commit 'a7eaf450781483791b02241fd6ab62767d4d6f99':
Dist the otatools package.
2015-08-25 17:21:57 +00:00
Ying Wang
a7eaf45078
Merge "Dist the otatools package."
2015-08-25 17:12:36 +00:00
Stephen Smalley
75770de701
Only allow toolbox exec where /system exec was already allowed.
...
When the toolbox domain was introduced, we allowed all domains to exec it
to avoid breakage. However, only domains that were previously allowed the
ability to exec /system files would have been able to do this prior to the
introduction of the toolbox domain. Remove the rule from domain.te and add
rules to all domains that are already allowed execute_no_trans to system_file.
Requires coordination with device-specific policy changes with the same Change-Id.
Change-Id: Ie46209f0412f9914857dc3d7c6b0917b7031aae5
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov >
2015-08-25 11:46:12 -04:00
Bart Sears
0bb3145b56
Set the Security Patch level for MNC
...
MNC will include the security patches from the August OEM bulletin
which will have a patch date of September 1.
Bug: 23288951
Change-Id: Ia0f313bf35fa7af1efed1787006bfbb614bc8c29
2015-08-24 23:22:20 -07:00
Doug Zongker
2bcfbe7e88
am 32bf3f32
: add otatools-package target
...
* commit '32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
add otatools-package target
2015-08-25 01:20:34 +00:00
Ying Wang
267e957373
Dist the otatools package.
...
Bug: 23495952
Change-Id: I1f61946580dd8ea29c3d5e1f4e859cc6d1f8554a
2015-08-24 17:13:53 -07:00
Tom Cherry
00c9b1b323
am 2899727f
: am bcbd4eb9
: Merge "remove TARGET_PROVIDES_INIT_RC"
...
* commit '2899727fd7c97729df11c59a4ebf76df73379a28':
remove TARGET_PROVIDES_INIT_RC
2015-08-24 23:35:17 +00:00
Tom Cherry
2899727fd7
am bcbd4eb9
: Merge "remove TARGET_PROVIDES_INIT_RC"
...
* commit 'bcbd4eb9fb9c82f35ca46cc9b976a59b6c1645d4':
remove TARGET_PROVIDES_INIT_RC
2015-08-24 23:28:34 +00:00
Tom Cherry
bcbd4eb9fb
Merge "remove TARGET_PROVIDES_INIT_RC"
2015-08-24 23:23:36 +00:00
Doug Zongker
32bf3f3265
add otatools-package target
...
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.
Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit f22b0f43ef
)
2015-08-24 15:43:40 -07:00
Tom Cherry
2df35aea43
remove TARGET_PROVIDES_INIT_RC
...
Change-Id: I765b80d48333f54fb995e4ccfd77d38683c6cbb9
2015-08-24 13:55:02 -07:00
smain@google.com
6e0cca0876
am ed7e864a
: fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation scr
...
* commit 'ed7e864a735f004f1dbb4a2db5261855b5693913':
fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation script when clicking download before agree because it reloaded the page (unkown cause) depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/
2015-08-24 16:41:10 +00:00
Christopher Wiley
3f7c5424db
am 2b2c9dff
: am 4e719eaf
: Merge "Change .dbus.xml extension to .dbus-xml"
...
* commit '2b2c9dff35304c21ebe1e793a16443a882920f75':
Change .dbus.xml extension to .dbus-xml
2015-08-21 22:24:31 +00:00
Christopher Wiley
2b2c9dff35
am 4e719eaf
: Merge "Change .dbus.xml extension to .dbus-xml"
...
* commit '4e719eafc4d183dd923518cea6292f37ee1e26c6':
Change .dbus.xml extension to .dbus-xml
2015-08-21 20:51:11 +00:00
Christopher Wiley
4e719eafc4
Merge "Change .dbus.xml extension to .dbus-xml"
2015-08-21 20:46:21 +00:00
Shinichiro Hamaji
8a0607f069
am b3cd0a56
: am 39c7d243
: Merge "Use goma when USE_GOMA=true is set"
...
* commit 'b3cd0a566391726a69d9f0e439268f4caf5df7db':
Use goma when USE_GOMA=true is set
2015-08-21 03:36:12 +00:00
Shinichiro Hamaji
b3cd0a5663
am 39c7d243
: Merge "Use goma when USE_GOMA=true is set"
...
* commit '39c7d243395ad3f2015571aaf902dc4d4686e981':
Use goma when USE_GOMA=true is set
2015-08-21 03:29:49 +00:00