OSDN Git Service
Tao Bao [Wed, 9 Mar 2016 05:43:17 +0000 (05:43 +0000)]
resolve merge conflicts of
2ad8b97577 to nyc-dev
am:
00ed831a11
* commit '
00ed831a11f1fd55414299fc5d549472d0454a19':
Use the update-binary in the source build for downgrade OTAs.
Tao Bao [Wed, 9 Mar 2016 05:39:13 +0000 (21:39 -0800)]
resolve merge conflicts of
2ad8b97577 to nyc-dev
Change-Id: Ifa7501e58dd25e73ed760b1383a1873e4d449885
Tao Bao [Wed, 9 Mar 2016 05:29:30 +0000 (05:29 +0000)]
Use the update-binary in the source build for downgrade OTAs. am:
fa41fb2705
am:
7302eb7dd6
* commit '
7302eb7dd6bd22c6123bd0b252889732e215592e':
Use the update-binary in the source build for downgrade OTAs.
Tao Bao [Wed, 9 Mar 2016 05:27:36 +0000 (05:27 +0000)]
Use the update-binary in the source build for downgrade OTAs.
am:
fa41fb2705
* commit '
fa41fb27054185b3fba0519d01dabd21444fe772':
Use the update-binary in the source build for downgrade OTAs.
Colin Cross [Wed, 9 Mar 2016 04:49:49 +0000 (04:49 +0000)]
Merge "Install boot.art extra files individually" into nyc-dev
am:
8e47cb7d82
* commit '
8e47cb7d821d52fd85191f6bdb8c7998fbdb29f5':
Install boot.art extra files individually
Colin Cross [Wed, 9 Mar 2016 04:45:39 +0000 (04:45 +0000)]
Merge "Install boot.art extra files individually" into nyc-dev
Tao Bao [Wed, 9 Mar 2016 03:32:44 +0000 (03:32 +0000)]
Merge "Use the update-binary in the source build for downgrade OTAs."
am:
6be54d774b
* commit '
6be54d774ba13c79e96b12b797e95bd5bdba0344':
Use the update-binary in the source build for downgrade OTAs.
Tao Bao [Wed, 9 Mar 2016 03:26:19 +0000 (03:26 +0000)]
Merge "Use the update-binary in the source build for downgrade OTAs."
Tao Bao [Wed, 9 Mar 2016 03:05:28 +0000 (03:05 +0000)]
releasetools: Fix the bug in AssertSequenceGood.
am:
ff75c23086
* commit '
ff75c230860ff3e88c1e73cfcc62270d76af29bc':
releasetools: Fix the bug in AssertSequenceGood.
Tao Bao [Fri, 4 Mar 2016 23:23:34 +0000 (15:23 -0800)]
releasetools: Fix the bug in AssertSequenceGood.
We use a bitset for blocks in the target image to assert a block hasn't
been touched before reading. Skip checking the blocks that are in the
source image only.
Bug:
27556903
Change-Id: I3a77292da673c813bd20d8dc177ff36419d8ecae
(cherry picked from commit
dca2200c8aa09b08ba0d37410a7826b737caecf2)
Tao Bao [Wed, 9 Mar 2016 01:53:39 +0000 (17:53 -0800)]
Use the update-binary in the source build for downgrade OTAs.
We used to use the update-binary from the target build when creating
incremental OTAs. But for downgrade OTAs, we should use the one in the
source build instead, which is actually newer.
Bug:
27556903
Change-Id: Ib6415729b979dbffdebdda24902f7f560942801a
(cherry picked from commit
4996cf03d2321eef56a8163c7fc73ba9976e1021)
Colin Cross [Tue, 8 Mar 2016 21:21:49 +0000 (13:21 -0800)]
Install boot.art extra files individually
The rule that builds boot.art also produces boot.oat, boot-*.art, and
boot-*.oat as a side effect, and the install rule for boot.art was
installing them using *.art and *.oat. This meant that PDK builds had
no rule to install the extra files, so it used the ones from the
platform.zip file instead of the locally built ones.
Generate a list of the files that should be produced by the boot.art
build, and manually create install rules for them that depend on the
built boot.art and are depended on by the installed boot.art.
Bug:
27546601
Change-Id: I9734491c3179bca2d4b2ae13b0c6a03e4c26b0b2
Tao Bao [Wed, 9 Mar 2016 01:53:39 +0000 (17:53 -0800)]
Use the update-binary in the source build for downgrade OTAs.
We used to use the update-binary from the target build when creating
incremental OTAs. But for downgrade OTAs, we should use the one in the
source build instead, which is actually newer.
Bug:
27556903
Change-Id: Ib6415729b979dbffdebdda24902f7f560942801a
smain@google.com [Tue, 8 Mar 2016 21:36:29 +0000 (21:36 +0000)]
Add new templates directory for "reference only" builds. The only difference is that this changes the masthead.cs file to show a different header.
am:
b8b72c14e5
* commit '
b8b72c14e5eaaabcb630a1174a1e03a809f340f0':
Add new templates directory for "reference only" builds. The only difference is that this changes the masthead.cs file to show a different header.
smain@google.com [Tue, 8 Mar 2016 02:43:21 +0000 (18:43 -0800)]
Add new templates directory for "reference only" builds.
The only difference is that this changes the masthead.cs file to show a different header.
Change-Id: Id58eb7e8c42a8ab0886f2f5da794fcd108f299ff
(cherry picked from commit
5fea5df99cc93dba5388e0f033c2af931ac2cb33)
Sami Tolvanen [Tue, 8 Mar 2016 17:03:42 +0000 (17:03 +0000)]
build: pass version and patch level to mkbootimg
am:
e555f77962
* commit '
e555f779626faeeddd8d23339241fa6a9240fa28':
build: pass version and patch level to mkbootimg
Sami Tolvanen [Fri, 4 Mar 2016 23:41:02 +0000 (15:41 -0800)]
build: pass version and patch level to mkbootimg
Add --os_version and --os_patch_level arguments to mkbootimg.
Needs matching changes from
I57682611e0c27fec5ed284da7d9a788383ff98b1
Bug:
27498078
Bug:
22914603
Change-Id: I04e20b0de40d864aac92ac7bcf466a6cbde3d0e4
(cherry pick from commit
8fb47f191f804d21e252ef7bb66886ea087c2d56)
Sami Tolvanen [Tue, 8 Mar 2016 16:10:23 +0000 (16:10 +0000)]
Merge "build: pass version and patch level to mkbootimg" am:
b32d845090
am:
450f15111c
* commit '
450f15111ccd9fa54382e159a145954273f45b15':
build: pass version and patch level to mkbootimg
Sami Tolvanen [Tue, 8 Mar 2016 16:08:14 +0000 (16:08 +0000)]
Merge "build: pass version and patch level to mkbootimg"
am:
b32d845090
* commit '
b32d845090d19d2dfbbf32d4628ef81478325927':
build: pass version and patch level to mkbootimg
Sami Tolvanen [Tue, 8 Mar 2016 16:02:24 +0000 (16:02 +0000)]
Merge "build: pass version and patch level to mkbootimg"
Dan Willemsen [Tue, 8 Mar 2016 07:46:03 +0000 (07:46 +0000)]
Merge "Reexport include dirs for whole static libs" am:
e2379484ab
am:
90074f7f1f
* commit '
90074f7f1f128cbd528d6d709bb3aa2d22783884':
Reexport include dirs for whole static libs
Martin Blumenstingl [Tue, 8 Mar 2016 07:45:51 +0000 (07:45 +0000)]
Merge "Removed duplicate definition of E2FSCK" am:
d7a4e56a87
am:
7b578cbf10
* commit '
7b578cbf10aab7460a0cc4e5735870a714ddac1b':
Removed duplicate definition of E2FSCK
Tao Bao [Tue, 8 Mar 2016 07:45:37 +0000 (07:45 +0000)]
Merge "releasetools: Fix the bug in AssertSequenceGood." am:
236e664efa
am:
cc9c8ce966
* commit '
cc9c8ce96639e0e7c100744703733ff3bb5c75ce':
releasetools: Fix the bug in AssertSequenceGood.
Elliott Hughes [Tue, 8 Mar 2016 07:45:25 +0000 (07:45 +0000)]
Merge "Use ulimit -p rather than prlimit." am:
74d4d98be1
am:
e9f81ac2cd
* commit '
e9f81ac2cd94f637078c9c8267fd3d9ee70a8c5f':
Use ulimit -p rather than prlimit.
Elliott Hughes [Tue, 8 Mar 2016 07:45:11 +0000 (07:45 +0000)]
Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark." am:
ef0c20621d
am:
9c34174b76
* commit '
9c34174b7620142ae7f8116d097996a4a0f15d30':
Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark.
Tao Bao [Tue, 8 Mar 2016 05:53:27 +0000 (05:53 +0000)]
resolve merge conflicts of
08a3a32fa9 to nyc-dev
am:
84bc4b78cc
* commit '
84bc4b78cc188e795e94eedc437cf9c5567c6506':
DO NOT MERGE releasetools: Support generating downgrade incremental OTAs.
Tao Bao [Tue, 8 Mar 2016 05:49:33 +0000 (21:49 -0800)]
resolve merge conflicts of
08a3a32fa9 to nyc-dev
Change-Id: I6fd55b3d2bd0c396018163dd4f54970cb55432cd
Tao Bao [Tue, 8 Mar 2016 05:37:27 +0000 (05:37 +0000)]
resolve merge conflicts of
177c610e7f to cw-e-dev
am:
bd25fcdc02
* commit '
bd25fcdc02a94ec9f50fc431a3731484b9812e23':
DO NOT MERGE releasetools: Support generating downgrade incremental OTAs.
Tao Bao [Tue, 8 Mar 2016 05:24:40 +0000 (21:24 -0800)]
resolve merge conflicts of
177c610e7f to cw-e-dev
Change-Id: Iba7820247d0b53d7f9553290eb0db3547f31beda
Tao Bao [Tue, 23 Feb 2016 19:38:39 +0000 (11:38 -0800)]
DO NOT MERGE releasetools: Support generating downgrade incremental OTAs.
Add --downgrade flag to ota_from_target_files.py script. It allows
generating an incremental OTA that updates from a newer build to an
older one (based on timestamp comparison). "post-timestamp" line in the
metadata file will be replaced by "ota-downgrade=yes". A data wipe will
always be enforced, so "ota-wipe=yes" will also be included in the
metadata file.
Bug:
26883782
Change-Id: Iaa05f662d948b7ab632a9fbb7051cc3f8bf68c21
(cherry picked from commit
5d1825664a0fec256fa28d62aadcac96f59a41b2)
Yabin Cui [Tue, 8 Mar 2016 00:19:32 +0000 (00:19 +0000)]
Enable LOCAL_POST_LINK_CMD for non-static executables.
am:
9963b699f3
* commit '
9963b699f3b58043bf6fd5720a4a816eb8219bd2':
Enable LOCAL_POST_LINK_CMD for non-static executables.
Dan Willemsen [Tue, 8 Mar 2016 00:16:45 +0000 (00:16 +0000)]
Merge "Reexport include dirs for whole static libs"
am:
e2379484ab
* commit '
e2379484ab96e7e5f9a60061557e492068ef1789':
Reexport include dirs for whole static libs
Dan Willemsen [Tue, 8 Mar 2016 00:14:02 +0000 (00:14 +0000)]
Merge "Reexport include dirs for whole static libs"
Martin Blumenstingl [Tue, 8 Mar 2016 00:05:12 +0000 (00:05 +0000)]
Merge "Removed duplicate definition of E2FSCK"
am:
d7a4e56a87
* commit '
d7a4e56a87c324378e60f5989a14a5d5addfd456':
Removed duplicate definition of E2FSCK
Colin Cross [Mon, 7 Mar 2016 23:54:40 +0000 (23:54 +0000)]
Merge "Removed duplicate definition of E2FSCK"
Tao Bao [Mon, 7 Mar 2016 22:35:40 +0000 (22:35 +0000)]
Merge "releasetools: Fix the bug in AssertSequenceGood."
am:
236e664efa
* commit '
236e664efa04bd92ce28ba553afebf8e79ca17fa':
releasetools: Fix the bug in AssertSequenceGood.
Tao Bao [Mon, 7 Mar 2016 22:25:02 +0000 (22:25 +0000)]
Merge "releasetools: Fix the bug in AssertSequenceGood."
Elliott Hughes [Mon, 7 Mar 2016 22:17:37 +0000 (22:17 +0000)]
Merge "Use ulimit -p rather than prlimit."
am:
74d4d98be1
* commit '
74d4d98be1156982a1ab9a26be1dac26ee4e51d1':
Use ulimit -p rather than prlimit.
Elliott Hughes [Mon, 7 Mar 2016 22:10:44 +0000 (22:10 +0000)]
Merge "Use ulimit -p rather than prlimit."
Elliott Hughes [Mon, 7 Mar 2016 21:53:53 +0000 (13:53 -0800)]
Use ulimit -p rather than prlimit.
Neither is standard, but ulimit is toybox and therefore a bit more
regular and at least has help text.
Change-Id: Id7ba9adc9ca256b821d8060506010abef30dee28
Ying Wang [Mon, 7 Mar 2016 21:34:55 +0000 (21:34 +0000)]
Fix dumping variables of absolute paths.
am:
f56ffa5851
* commit '
f56ffa5851f0f51a8e19693d44fb6e1c3d9debb9':
Fix dumping variables of absolute paths.
Elliott Hughes [Mon, 7 Mar 2016 21:22:53 +0000 (21:22 +0000)]
Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark."
am:
ef0c20621d
* commit '
ef0c20621d7b82f25f8fa669a0b2d8031588169d':
Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark.
Yabin Cui [Wed, 2 Mar 2016 22:03:41 +0000 (14:03 -0800)]
Enable LOCAL_POST_LINK_CMD for non-static executables.
It is needed to insert testdata section into simpleperf cts test.
Bug:
27387280
Change-Id: I58cea106d135f535626d8624a016bd2aaceeb8ea
(cherry picked from commit
273e9109c1cefb760d96b8707d75704d733cc38b)
Elliott Hughes [Mon, 7 Mar 2016 21:17:45 +0000 (21:17 +0000)]
Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark."
Ying Wang [Mon, 7 Mar 2016 20:06:03 +0000 (20:06 +0000)]
Merge "Fix dumping variables of absolute paths." am:
dd70b91060
am:
ad68d904a1
* commit '
ad68d904a1bdcb1a64f4a5b1e35cd38e085021e2':
Fix dumping variables of absolute paths.
Ying Wang [Mon, 7 Mar 2016 20:04:13 +0000 (20:04 +0000)]
Merge "Fix dumping variables of absolute paths."
am:
dd70b91060
* commit '
dd70b9106079f39738c129c6f874576748f92d3e':
Fix dumping variables of absolute paths.
Ying Wang [Mon, 7 Mar 2016 19:27:20 +0000 (11:27 -0800)]
Fix dumping variables of absolute paths.
Calling $(abspath) is better than checking and prepending $(PWD) if
necessary.
Bug:
27429759
Change-Id: Ia156f8a5d6b88b6090f4d23c7f9166bd62d3ab70
(cherry-pick from commit
80ceadc94526d6c48c0022bf25281bb522914a3d)
Ying Wang [Mon, 7 Mar 2016 19:58:14 +0000 (19:58 +0000)]
Merge "Fix dumping variables of absolute paths."
Sami Tolvanen [Fri, 4 Mar 2016 23:41:02 +0000 (15:41 -0800)]
build: pass version and patch level to mkbootimg
Add --os_version and --os_patch_level arguments to mkbootimg.
Needs matching changes from
I57682611e0c27fec5ed284da7d9a788383ff98b1
Bug:
27498078
Bug:
22914603
Change-Id: I04e20b0de40d864aac92ac7bcf466a6cbde3d0e4
Ying Wang [Mon, 7 Mar 2016 19:27:20 +0000 (11:27 -0800)]
Fix dumping variables of absolute paths.
Calling $(abspath) is better than checking and prepending $(PWD) if
necessary.
Bug:
27429759
Change-Id: Ia156f8a5d6b88b6090f4d23c7f9166bd62d3ab70
Julien Desprez [Mon, 7 Mar 2016 19:19:25 +0000 (19:19 +0000)]
Support build old version of cts
am:
ffc9c52243
* commit '
ffc9c52243499d5d65edfd7f795ae44370f64a29':
Support build old version of cts
Julien Desprez [Sat, 5 Mar 2016 12:05:49 +0000 (12:05 +0000)]
Support build old version of cts
Bug:
27508747
Change-Id: I3d474f6f6534e172ecf1d0a6c833a9dfa6164344
Martin Blumenstingl [Sun, 6 Mar 2016 21:38:19 +0000 (22:38 +0100)]
Removed duplicate definition of E2FSCK
Change-Id: I810711ad05e198ee1f9606c37649e80df7b55fa5
Ying Wang [Sat, 5 Mar 2016 00:34:29 +0000 (00:34 +0000)]
Merge "Delete relics left behind by commit
86e6b7ed51dab3e ." am:
880c9ffe7a
am:
87545466a8
* commit '
87545466a81490794dc086b84f489c5327dfa7c4':
Delete relics left behind by commit
86e6b7ed51dab3e .
Ying Wang [Sat, 5 Mar 2016 00:32:27 +0000 (00:32 +0000)]
Merge "Delete relics left behind by commit
86e6b7ed51dab3e ."
am:
880c9ffe7a
* commit '
880c9ffe7a47c163f986f7bc02963bbde1c83c0f':
Delete relics left behind by commit
86e6b7ed51dab3e .
Ying Wang [Sat, 5 Mar 2016 00:29:00 +0000 (00:29 +0000)]
Merge "Delete relics left behind by commit
86e6b7ed51dab3e ."
Ying Wang [Sat, 5 Mar 2016 00:24:36 +0000 (16:24 -0800)]
Delete relics left behind by commit
86e6b7ed51dab3e .
Change-Id: I81febc28f471727fc37335b11e47749753a57997
(cherry-pick from commit
0f59fdf30db2209cf30ea042d86ef60dcf807838)
Dan Willemsen [Fri, 4 Mar 2016 23:57:42 +0000 (23:57 +0000)]
Merge "Tell soong about MALLOC_SVELTE" am:
fd2691c35f
am:
14950e0db7
* commit '
14950e0db7f77c43f4bac695b3d0268d3ebaf929':
Tell soong about MALLOC_SVELTE
Prathmesh Prabhu [Fri, 4 Mar 2016 23:55:54 +0000 (23:55 +0000)]
Merge "emulator: Add a product packages overlay." into nyc-dev
am:
f585b02bed
* commit '
f585b02bed939f81e3f35f75a69ae4fe45cbc406':
emulator: Add a product packages overlay.
Dan Willemsen [Fri, 4 Mar 2016 23:55:48 +0000 (23:55 +0000)]
Merge "Tell soong about MALLOC_SVELTE"
am:
fd2691c35f
* commit '
fd2691c35f6e0c7b5339befa8afefaebdfb72283':
Tell soong about MALLOC_SVELTE
Dan Willemsen [Fri, 4 Mar 2016 23:53:36 +0000 (23:53 +0000)]
Merge "Tell soong about MALLOC_SVELTE"
Prathmesh Prabhu [Fri, 4 Mar 2016 23:49:07 +0000 (23:49 +0000)]
Merge "emulator: Add a product packages overlay." into nyc-dev
Tao Bao [Fri, 4 Mar 2016 23:23:34 +0000 (15:23 -0800)]
releasetools: Fix the bug in AssertSequenceGood.
We use a bitset for blocks in the target image to assert a block hasn't
been touched before reading. Skip checking the blocks that are in the
source image only.
Change-Id: I3a77292da673c813bd20d8dc177ff36419d8ecae
Dan Albert [Fri, 4 Mar 2016 22:36:56 +0000 (22:36 +0000)]
Merge "Get gtest includes from the exported headers." am:
f8b170dc52
am:
1bbd4dac85
* commit '
1bbd4dac858316b924ba231ca123c6ac5ac14157':
Get gtest includes from the exported headers.
Dan Albert [Fri, 4 Mar 2016 22:34:39 +0000 (22:34 +0000)]
Merge "Get gtest includes from the exported headers."
am:
f8b170dc52
* commit '
f8b170dc52575f16a63bfd6b6710efb46580c8b2':
Get gtest includes from the exported headers.
Dan Albert [Fri, 4 Mar 2016 22:30:58 +0000 (22:30 +0000)]
Merge "Get gtest includes from the exported headers."
Ying Wang [Fri, 4 Mar 2016 22:12:38 +0000 (22:12 +0000)]
Ying Wang [Fri, 4 Mar 2016 22:10:41 +0000 (22:10 +0000)]
Ying Wang [Fri, 4 Mar 2016 22:10:23 +0000 (22:10 +0000)]
Merge "Small fixes."
am:
dfa0d1063a
* commit '
dfa0d1063a8b07c22d79116be799ffda537211e8':
Small fixes.
Ying Wang [Fri, 4 Mar 2016 22:10:22 +0000 (22:10 +0000)]
Speed up lunch/tapas/etc. shell utility functions.
am:
7dfdb843b2
* commit '
7dfdb843b25b4ef04c47b148e0095f292eceacd4':
Speed up lunch/tapas/etc. shell utility functions.
Ying Wang [Fri, 4 Mar 2016 21:56:23 +0000 (13:56 -0800)]
Small fixes.
Change-Id: Ia949ed0bc93edb78d0b029f3bd3dd584e9a00dc8
(cherry-pick from commit
f0cb397a9e204c86be7730f94ae5fba84d88f89a)
Ying Wang [Fri, 4 Mar 2016 04:57:21 +0000 (20:57 -0800)]
Speed up lunch/tapas/etc. shell utility functions.
1. Combined ~10 calls to the make build system to only one.
We added a phony target "dump-many-vars" to the build system to dump
"<var>=<value>" pairs. We then store the pairs as shell variables.
With this cache get_build_var/get_abs_build_var can just return
the shell variables instead of querying the build system.
2. Prune .git when we search for AndroidProduct.mks.
In internal source tree lunch time was reduced from ~15s to ~1.5s.
Bug:
27429759
(cherry picked from commit
08800fd905e70faf01d9392d00ff3f49d99097b7)
Change-Id: I862a0ec3c1aae97c552054dacec133e857042edf
Ying Wang [Fri, 4 Mar 2016 21:58:08 +0000 (21:58 +0000)]
Merge "Small fixes."
Ying Wang [Fri, 4 Mar 2016 21:56:23 +0000 (13:56 -0800)]
Small fixes.
Change-Id: Ia949ed0bc93edb78d0b029f3bd3dd584e9a00dc8
Prathmesh Prabhu [Fri, 4 Mar 2016 21:43:04 +0000 (13:43 -0800)]
emulator: Add a product packages overlay.
Emulator is a product, so add an overlay that allows us to override some
stock android resources.
BUG:
27484734
Change-Id: I1b651316a14f6d5c79651813ad13302b67507cae
Elliott Hughes [Fri, 4 Mar 2016 21:37:43 +0000 (13:37 -0800)]
Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark.
Bug: http://b/
24803663
Change-Id: I1565cf680298a1765e88162d8b0e59dedba29bd7
Dan Willemsen [Fri, 4 Mar 2016 21:02:05 +0000 (21:02 +0000)]
Merge "Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S" am:
6d813d8c92
am:
851983bbf2
* commit '
851983bbf2dc9cf2ea5877d6e95a9d962bd63fdd':
Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S
Dan Willemsen [Fri, 4 Mar 2016 20:59:24 +0000 (20:59 +0000)]
Merge "Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S"
am:
6d813d8c92
* commit '
6d813d8c9223ba6e55e98f23a8a8c2248466feff':
Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S
Dan Willemsen [Fri, 4 Mar 2016 20:52:57 +0000 (20:52 +0000)]
Merge "Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S"
Dan Willemsen [Fri, 4 Mar 2016 20:40:25 +0000 (12:40 -0800)]
Reexport include dirs for whole static libs
When a static library uses LOCAL_EXPORT_C_INCLUDE_DIRS, then is included
entirely in another library with LOCAL_WHOLE_STATIC_LIBRARIES, all the
symbols are reexported, so reexport the headers too.
Change-Id: I92cf17894fc991a5b5ecb59ca5e095e407c98de4
Tao Bao [Fri, 4 Mar 2016 19:32:02 +0000 (19:32 +0000)]
Merge "releasetools: Fix one missing case for --oem_no_mount." am:
4e677900f7
am:
aa82bd62cb
* commit '
aa82bd62cb65ae91eadd53f2d37ac5b57c1fc584':
releasetools: Fix one missing case for --oem_no_mount.
Tao Bao [Fri, 4 Mar 2016 19:30:01 +0000 (19:30 +0000)]
Merge "releasetools: Fix one missing case for --oem_no_mount."
am:
4e677900f7
* commit '
4e677900f7b0017fcd926dc66d778e355e6a1bae':
releasetools: Fix one missing case for --oem_no_mount.
Tao Bao [Fri, 4 Mar 2016 19:20:15 +0000 (19:20 +0000)]
Merge "releasetools: Fix one missing case for --oem_no_mount."
Ying Wang [Fri, 4 Mar 2016 19:08:52 +0000 (19:08 +0000)]
Merge "Speed up lunch/tapas/etc. shell utility functions." am:
d3c08f8b76
am:
be81620114
* commit '
be81620114432ae4de5bffd494af0dfaab3899fe':
Speed up lunch/tapas/etc. shell utility functions.
Ying Wang [Fri, 4 Mar 2016 19:06:53 +0000 (19:06 +0000)]
Merge "Speed up lunch/tapas/etc. shell utility functions."
am:
d3c08f8b76
* commit '
d3c08f8b763c1d8f865896cf7d03d1794bdd14fe':
Speed up lunch/tapas/etc. shell utility functions.
Ying Wang [Fri, 4 Mar 2016 19:03:56 +0000 (19:03 +0000)]
Merge "Speed up lunch/tapas/etc. shell utility functions."
Ying Wang [Fri, 4 Mar 2016 04:57:21 +0000 (20:57 -0800)]
Speed up lunch/tapas/etc. shell utility functions.
1. Combined ~10 calls to the make build system to only one.
We added a phony target "dump-many-vars" to the build system to dump
"<var>=<value>" pairs. We then store the pairs as shell variables.
With this cache get_build_var/get_abs_build_var can just return
the shell variables instead of querying the build system.
2. Prune .git when we search for AndroidProduct.mks.
In internal source tree lunch time was reduced from ~15s to ~1.5s.
Bug:
27429759
Change-Id: I24e88598f6fab598ef26518885fd5e86e71a772d
Ying Wang [Fri, 4 Mar 2016 18:56:25 +0000 (18:56 +0000)]
Merge "Align up java-lib-files and java-lib-deps." am:
58b8c86f84
am:
9f68962c47
* commit '
9f68962c4782026f9178ce277eab9dd8564e1a00':
Align up java-lib-files and java-lib-deps.
Ying Wang [Fri, 4 Mar 2016 18:54:25 +0000 (18:54 +0000)]
Merge "Align up java-lib-files and java-lib-deps."
am:
58b8c86f84
* commit '
58b8c86f84ad0bf8fb3bb7dfc259fd1e3ce0dae1':
Align up java-lib-files and java-lib-deps.
Ying Wang [Fri, 4 Mar 2016 18:40:05 +0000 (18:40 +0000)]
Merge "Align up java-lib-files and java-lib-deps."
Ying Wang [Thu, 3 Mar 2016 01:25:01 +0000 (17:25 -0800)]
Align up java-lib-files and java-lib-deps.
- For host Java libraries, java-lib-files should return javalib.jar.
- Host dalvik Java libraries are special: factor out
host-dex-java-lib-files.
- Be explict that jack-lib-deps equals jack-lib-files.
Bug:
27451686
Change-Id: I9235384354e119ef7ebbf29b7e525d1ceea242e0
(cherry-pick from commit
063d0455e0f3a14f2577a26715f82e0bf3e79ee9)
Tao Bao [Fri, 4 Mar 2016 17:45:03 +0000 (09:45 -0800)]
releasetools: Fix one missing case for --oem_no_mount.
The CL in [1] added support for --oem_no_mount. It missed one place that
guards the OEM mounting.
[1] commit
8608cde944d64dece63e8c770deb78c1d092c719
Change-Id: I6ecaa94cd0866e0fd4fc88cb0aa3ebf55cde2968
Ying Wang [Fri, 4 Mar 2016 17:30:59 +0000 (17:30 +0000)]
Align up java-lib-files and java-lib-deps.
am:
063d0455e0
* commit '
063d0455e0f3a14f2577a26715f82e0bf3e79ee9':
Align up java-lib-files and java-lib-deps.
Neil Fuller [Fri, 4 Mar 2016 13:11:23 +0000 (13:11 +0000)]
Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY" am:
b97ce3bb61
am:
55d4ec523e
* commit '
55d4ec523ed6ce1894ab51c2742826b515c160b8':
Add JarJar support to BUILD_HOST_JAVA_LIBRARY
Neil Fuller [Fri, 4 Mar 2016 13:09:22 +0000 (13:09 +0000)]
Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY"
am:
b97ce3bb61
* commit '
b97ce3bb613c1ea18c9aea42e829ac34039b7679':
Add JarJar support to BUILD_HOST_JAVA_LIBRARY
Neil Fuller [Fri, 4 Mar 2016 12:58:44 +0000 (12:58 +0000)]
Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY"
Neil Fuller [Wed, 2 Mar 2016 11:19:41 +0000 (11:19 +0000)]
Add JarJar support to BUILD_HOST_JAVA_LIBRARY
This will allow us to convert icu4j-icudata / icu4j-icutzdata
targets to "host" targets rather than "target" targets.
Right now they are forcing Jack off just so they can use
javac + jarjar (even though the resulting file is used on
host).
Bug:
27218410
(cherry picked from commit
30b21ad579fab9669ec00845bfa092e4318eed10)
Change-Id: I4f16896606bcfdd00164078eeb142d05b29bb832
Dan Willemsen [Fri, 4 Mar 2016 01:37:50 +0000 (17:37 -0800)]
Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S
Target assembly files do not get these cflags, align the host
definitions to do the same.
Change-Id: Idadfa1f367c3ebea44460c5798225a85dd319371
Ying Wang [Thu, 3 Mar 2016 01:25:01 +0000 (17:25 -0800)]
Align up java-lib-files and java-lib-deps.
- For host Java libraries, java-lib-files should return javalib.jar.
- Host dalvik Java libraries are special: factor out
host-dex-java-lib-files.
- Be explict that jack-lib-deps equals jack-lib-files.
Bug:
27451686
Change-Id: I9235384354e119ef7ebbf29b7e525d1ceea242e0
Yabin Cui [Thu, 3 Mar 2016 19:42:54 +0000 (19:42 +0000)]
Merge "Enable LOCAL_POST_LINK_CMD for non-static executables." am:
1f310530fc
am:
a72e7dbd9c
* commit '
a72e7dbd9c44a0531ab0347c6f87c3f207c57907':
Enable LOCAL_POST_LINK_CMD for non-static executables.