Dan Willemsen
883897ec16
am d0ae4796: Merge "Blacklist libc++ from windows host builds"
...
* commit 'd0ae4796a10b9855a738c5f5c79e603cac30cb9f':
Blacklist libc++ from windows host builds
2015-09-01 16:37:42 +00:00
Richard Uhler
7086e1136a
am e4c753f4: Merge "Add ahat to runtime_libart product."
...
* commit 'e4c753f428ff404f10ec1bf170ea18ed2687dc07':
Add ahat to runtime_libart product.
2015-09-01 16:36:23 +00:00
Ying Wang
1cde7639ed
am 8838c72e: Merge "Cleaned the outdated incrementaljavac."
...
* commit '8838c72e8a339270fb3bea3d467200c6c0c28782':
Cleaned the outdated incrementaljavac.
2015-09-01 16:35:59 +00:00
Ying Wang
9bf627422c
resolved conflicts for merge of a15ae216
to stage-aosp-master
...
Change-Id: I9c10cf2d10f4295d12edd490ff0f9482c1810bf8
2015-09-01 09:31:56 -07:00
Shinichiro Hamaji
ec8f973147
Merge "Show error message when resource limit too low for USE_GOMA=true"
2015-09-01 02:26:15 +00:00
Dan Willemsen
d0ae4796a1
Merge "Blacklist libc++ from windows host builds"
2015-09-01 00:44:21 +00:00
Richard Uhler
e4c753f428
Merge "Add ahat to runtime_libart product."
2015-08-31 16:53:55 +00:00
Ying Wang
8838c72e8a
Merge "Cleaned the outdated incrementaljavac."
2015-08-29 18:09:20 +00:00
Ying Wang
3351178fb8
Cleaned the outdated incrementaljavac.
...
Nobody is using this feature and now we switched to jack.
Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
(cherry-picked from commit 90598cb70c
)
2015-08-29 11:08:02 -07:00
Ying Wang
a15ae2160a
Merge "Move Java stuff out of base_rules.mk"
2015-08-29 16:40:30 +00:00
Shinichiro Hamaji
b601d4b0e4
Show error message when resource limit too low for USE_GOMA=true
...
This should be particularly helpful for Mac users, because the
default limits of Mac are too low.
Change-Id: I03f0f76a0707b4ce5ef9cddf5df6e3857a215996
2015-08-29 12:01:51 +09:00
Ying Wang
956dcccf76
Move Java stuff out of base_rules.mk
...
- Moved the target-only .aidl and .logtag rules to java.mk.
- Moved the .proto rules, Java library dependency calculation,
Java resource processing and Java-related
target-specific and global variables setup to a new java_common.java,
which is shared by both target and host Java modules.
- Minor cleanup for the moved code.
Bug: 23597357
Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
2015-08-28 17:17:19 -07:00
Richard Uhler
7324f30a4f
Add ahat to runtime_libart product.
...
Change-Id: Iae5837f884c926a9f0e57df56bd21b6260ee8b2d
2015-08-28 16:30:17 -07:00
Elliott Hughes
f04f391b5f
am 4548e7f4: Merge "Remove AndroidConfig.h."
...
* commit '4548e7f49dbec05c8b8187b0ea9e746fc47ec5d3':
Remove AndroidConfig.h.
2015-08-28 19:59:18 +00:00
Elliott Hughes
4548e7f49d
Merge "Remove AndroidConfig.h."
2015-08-28 19:47:36 +00:00
Tao Bao
c9ff5102ad
am 35da9685: Merge "Use the basename of file_contexts from the info dict."
...
* commit '35da9685f0d3bb367b50aaa4c476b12907099f77':
Use the basename of file_contexts from the info dict.
2015-08-28 18:46:31 +00:00
Tao Bao
35da9685f0
Merge "Use the basename of file_contexts from the info dict."
2015-08-28 18:33:25 +00:00
Tao Bao
79735a6a82
Use the basename of file_contexts from the info dict.
...
Changes in [1] break the backward compatibility of the OTA scripts. Fix
the issue by extracting the file basename from the info dict in
META/misc_info.txt.
[1] commit d3a803e668
Bug: 23620049
Change-Id: I40a5625bbe0beb295f34b2328906a4a4283fe59b
2015-08-28 11:17:38 -07:00
Elliott Hughes
43146118aa
Remove AndroidConfig.h.
...
This change leaves soong references.
Change-Id: Iee32b6b97ad9711f69e999c9d01f01d71562b63f
2015-08-28 10:31:28 -07:00
Dan Willemsen
d174629951
am 57ff23b0: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"
...
* commit '57ff23b0ed02affce494d14d8a0f5e9e4717baf7':
Add support for LOCAL_SRC_FILES_(host)_(arch)
2015-08-28 03:49:02 +00:00
Dan Willemsen
399c59f3aa
am d5deac8d: Merge "Add _(darwin|linux|windows)"
...
* commit 'd5deac8db951ec0a1c9edd806ea1758b836f8c46':
Add _(darwin|linux|windows)
2015-08-28 03:49:01 +00:00
Dan Willemsen
57ff23b0ed
Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"
2015-08-28 03:39:34 +00:00
Dan Willemsen
85ac8d2a00
Add support for LOCAL_SRC_FILES_(host)_(arch)
...
For boringssl, which has architecture specific host assembly files
Bug: 23566667
Change-Id: Ia4602d28e93a1b3d1400cf95417b5e446c5fb84b
2015-08-28 03:38:43 +00:00
Dan Willemsen
d5deac8db9
Merge "Add _(darwin|linux|windows)"
2015-08-28 03:37:30 +00:00
Dan Willemsen
7a5498568f
Add _(darwin|linux|windows)
...
So that we can support building both linux and windows binaries at the
same time on a linux host. This replaces the ifeq($(HOST_OS),...) checks
in Android.mk files.
Bug: 23566667
Change-Id: I693e11984e36d55bb6f09fa0d49bc485463e16fb
2015-08-28 03:36:22 +00:00
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