OSDN Git Service
Daniel Rosenberg [Wed, 11 Nov 2015 03:21:34 +0000 (19:21 -0800)]
Allow building recovery as boot.
With BOARD_USES_RECOVERY_AS_BOOT = true, we skip building the
non-ramdisk boot.img but building the recovery image as boot.img. It
contains recovery's ramdisk (e.g. with /sbin/recovery). It depends on
the bootloader parameter (skip_initramfs) to determine the actual mode
to boot into.
Change-Id: Id6e2d0a2b94383944ca8f35bba688c6401745622
Aaron Holden [Thu, 17 Dec 2015 18:53:18 +0000 (18:53 +0000)]
Merge "Move suite-level dynamic config to testcases"
Dan Willemsen [Wed, 16 Dec 2015 23:44:55 +0000 (23:44 +0000)]
Merge "Define __BRILLO__ only for target modules" am:
e63d3328df
am:
05177f7cb1
* commit '
05177f7cb1e98b23a0c4b8899ba636ef7228e62b':
Define __BRILLO__ only for target modules
Dan Willemsen [Wed, 16 Dec 2015 23:44:49 +0000 (23:44 +0000)]
Merge "Move __BRILLO__ to the core build system" am:
3931873418
am:
152755aa81
* commit '
152755aa81354c7c931cb77c71ba3757a40a0cb6':
Move __BRILLO__ to the core build system
Todd Poynor [Wed, 16 Dec 2015 23:44:33 +0000 (23:44 +0000)]
Merge "Make squashfs sparse image generation optional" am:
ffce16c7e6
am:
77d1b2ec31
* commit '
77d1b2ec314dee2a381d3f0164a940dedb883281':
Make squashfs sparse image generation optional
Ying Wang [Wed, 16 Dec 2015 23:44:26 +0000 (23:44 +0000)]
Merge "make USER limited to 6 characters when generating BUILD_NUMBER" am:
e9430e2361
am:
71aaa02533
* commit '
71aaa02533a5a4c91bb360d4f5cfa9d11dc2c160':
make USER limited to 6 characters when generating BUILD_NUMBER
Dan Willemsen [Wed, 16 Dec 2015 23:39:27 +0000 (23:39 +0000)]
Merge "Define __BRILLO__ only for target modules"
am:
e63d3328df
* commit '
e63d3328dfc5a3e46233bf6fcc20a17e15d3545c':
Define __BRILLO__ only for target modules
Dan Willemsen [Wed, 16 Dec 2015 23:30:40 +0000 (23:30 +0000)]
Merge "Define __BRILLO__ only for target modules"
Dan Willemsen [Wed, 16 Dec 2015 23:25:10 +0000 (23:25 +0000)]
Merge "Move __BRILLO__ to the core build system"
am:
3931873418
* commit '
39318734186de8b2ed09d827f69877bf9bb8c9aa':
Move __BRILLO__ to the core build system
Dan Willemsen [Wed, 16 Dec 2015 23:14:09 +0000 (23:14 +0000)]
Merge "Move __BRILLO__ to the core build system"
Dan Willemsen [Wed, 16 Dec 2015 23:04:51 +0000 (15:04 -0800)]
Define __BRILLO__ only for target modules
__ANDROID__ is only defined for target modules, do the same for
__BRILLO__.
Change-Id: Ie1417e1a5b21c051acf05b2bd3bdb3ddd31be878
Todd Poynor [Wed, 16 Dec 2015 22:32:31 +0000 (22:32 +0000)]
Merge "Make squashfs sparse image generation optional"
am:
ffce16c7e6
* commit '
ffce16c7e6bdabb909a36c2b97b7881eddd5ba54':
Make squashfs sparse image generation optional
Dan Willemsen [Wed, 16 Dec 2015 21:32:27 +0000 (13:32 -0800)]
Move __BRILLO__ to the core build system
In preparation for locking down COMMON_GLOBAL_CFLAGS.
Bug:
26165350
Change-Id: Ifdfb7808c1e1b624ffb0f99ab443ec2c5503a81c
Todd Poynor [Wed, 16 Dec 2015 22:12:53 +0000 (22:12 +0000)]
Merge "Make squashfs sparse image generation optional"
Ying Wang [Wed, 16 Dec 2015 21:50:08 +0000 (21:50 +0000)]
Merge "make USER limited to 6 characters when generating BUILD_NUMBER"
am:
e9430e2361
* commit '
e9430e2361d152cae00e779fd055454fc0acf209':
make USER limited to 6 characters when generating BUILD_NUMBER
Ying Wang [Wed, 16 Dec 2015 21:42:07 +0000 (21:42 +0000)]
Merge "make USER limited to 6 characters when generating BUILD_NUMBER"
Aaron Holden [Tue, 15 Dec 2015 23:04:01 +0000 (15:04 -0800)]
Move suite-level dynamic config to testcases
Enable client-side dynamic config code to access the suite-level dynamic
config files by placing them in the testcases directory. Also update
cts_v2.mk to define the location of its corresponding dynamic config file.
bug:
23625592
Change-Id: Id11dea4b6acbe8ea7e5e9579e369a2be5873a224
Gina Dimino [Wed, 16 Dec 2015 19:38:57 +0000 (19:38 +0000)]
Merge "Docs: Replace custom search engine Bug:
25778395" am:
36412fa8f9
am:
2635974ed8
* commit '
2635974ed8574eac98266365287e0fd8c7cf6f2e':
Docs: Replace custom search engine Bug:
25778395
Gina Dimino [Wed, 16 Dec 2015 19:01:13 +0000 (19:01 +0000)]
Merge "Docs: Replace custom search engine Bug:
25778395"
am:
36412fa8f9
* commit '
36412fa8f9cc59c3aa31988d8a38576aeae6b6bd':
Docs: Replace custom search engine Bug:
25778395
Gina Dimino [Wed, 16 Dec 2015 18:49:42 +0000 (18:49 +0000)]
Merge "Docs: Replace custom search engine Bug:
25778395"
Gina Dimino [Mon, 14 Dec 2015 21:44:19 +0000 (13:44 -0800)]
Docs: Replace custom search engine
Bug:
25778395
Change-Id: I432698f63088a3e4ec285e46c7de2295c4cefad3
Than McIntosh [Wed, 16 Dec 2015 12:14:27 +0000 (04:14 -0800)]
Merge "Re-enable gold linker for aarch64." am:
9d76c75782
am:
831b4bca1b
* commit '
831b4bca1bf621119da7c64bb4736dd4f1b39fed':
Re-enable gold linker for aarch64.
Than McIntosh [Wed, 16 Dec 2015 12:10:32 +0000 (12:10 +0000)]
Merge "Re-enable gold linker for aarch64."
am:
9d76c75782
* commit '
9d76c757820701587013aa295f4482c915d4b166':
Re-enable gold linker for aarch64.
Than McIntosh [Wed, 16 Dec 2015 12:02:04 +0000 (12:02 +0000)]
Merge "Re-enable gold linker for aarch64."
weiqiao [Tue, 15 Dec 2015 07:57:22 +0000 (15:57 +0800)]
make USER limited to 6 characters when generating BUILD_NUMBER
BUILD_NUMBER is use to generate ro.build.description and
ro.build.display.id, if USER is long, these properties will
exceed 91 characters easily.
Change-Id: I7f99ef351f80210172a873104edd980b36c3f8f1
Signed-off-by: weiqiao <qiaowei224@gmail.com>
Todd Poynor [Wed, 16 Dec 2015 02:00:14 +0000 (18:00 -0800)]
Make squashfs sparse image generation optional
Allow non-sparse squashfs image generation, a la ext filesystems.
Bug:
26218766
Change-Id: Ifd596af16411e0cf69a2e7e05d725fd9442dc79c
Colin Cross [Wed, 16 Dec 2015 02:01:39 +0000 (02:01 +0000)]
Merge "Tell soong that it is embedded in a make build" am:
61b771e79f
am:
17f2961cd6
* commit '
17f2961cd657db074440f970ddf3d3a2b5a0fe28':
Tell soong that it is embedded in a make build
Colin Cross [Wed, 16 Dec 2015 02:01:26 +0000 (02:01 +0000)]
Merge "Combine soong builds into make builds" am:
3bfc560cc5
am:
17d3f5426b
* commit '
17d3f5426b71a510244bdbbe5a0e7f0548692420':
Combine soong builds into make builds
Colin Cross [Wed, 16 Dec 2015 02:01:19 +0000 (02:01 +0000)]
Merge "Remove unneccessary TARGET_BUILD_APPS conditional" am:
e416a5f716
am:
1452e0a389
* commit '
1452e0a389a24a6515bc8915076a93155f7bbced':
Remove unneccessary TARGET_BUILD_APPS conditional
Colin Cross [Wed, 16 Dec 2015 01:57:20 +0000 (01:57 +0000)]
Merge "Tell soong that it is embedded in a make build"
am:
61b771e79f
* commit '
61b771e79f19f19eae62d1b7a97d105ef6222cff':
Tell soong that it is embedded in a make build
Colin Cross [Wed, 16 Dec 2015 01:57:07 +0000 (01:57 +0000)]
Merge "Combine soong builds into make builds"
am:
3bfc560cc5
* commit '
3bfc560cc54b58376d095aeaf22d3a74726bcec7':
Combine soong builds into make builds
Colin Cross [Wed, 16 Dec 2015 01:47:14 +0000 (01:47 +0000)]
Merge "Tell soong that it is embedded in a make build"
Dan Willemsen [Fri, 11 Dec 2015 21:50:00 +0000 (13:50 -0800)]
Tell soong that it is embedded in a make build
So that it can munge its ninja targets to not conflict with make.
Change-Id: I0c2273c0ca2fdfced1fa1590f2ea3eac8cddb905
Colin Cross [Wed, 16 Dec 2015 01:46:52 +0000 (01:46 +0000)]
Merge "Combine soong builds into make builds"
Colin Cross [Wed, 16 Dec 2015 01:33:33 +0000 (01:33 +0000)]
Merge "Remove unneccessary TARGET_BUILD_APPS conditional"
am:
e416a5f716
* commit '
e416a5f71638bc324a368e4c66a4834117322c7a':
Remove unneccessary TARGET_BUILD_APPS conditional
Colin Cross [Wed, 16 Dec 2015 00:56:08 +0000 (00:56 +0000)]
Merge "Remove unneccessary TARGET_BUILD_APPS conditional"
Colin Cross [Mon, 9 Nov 2015 22:53:36 +0000 (14:53 -0800)]
Combine soong builds into make builds
Bootstrap soong if necessary, and wrap the kati and soong ninja files
into a single ninja file.
Change-Id: I0000c7eaa1adda763189681c57ec27a97a12ee1f
Colin Cross [Thu, 3 Dec 2015 01:17:51 +0000 (17:17 -0800)]
Remove unneccessary TARGET_BUILD_APPS conditional
The prebuilt tools no longer conflict with the tools built from source,
remove the conditional.
Change-Id: Id334e25d9cfa2d5934450dd223bc9e30cd890062
Ying Wang [Tue, 15 Dec 2015 23:19:35 +0000 (23:19 +0000)]
Merge "Remove the prebuilt tools cleanstep logic." am:
cff032ca54
am:
13a225ff9f
* commit '
13a225ff9fa382ac543eba30fe70c08c4a69eeeb':
Remove the prebuilt tools cleanstep logic.
Ying Wang [Tue, 15 Dec 2015 21:56:59 +0000 (21:56 +0000)]
Merge "Remove the prebuilt tools cleanstep logic."
am:
cff032ca54
* commit '
cff032ca54f4dfc06f88b863d09c66040151bc36':
Remove the prebuilt tools cleanstep logic.
Ying Wang [Tue, 15 Dec 2015 21:45:44 +0000 (21:45 +0000)]
Merge "Remove the prebuilt tools cleanstep logic."
Ying Wang [Tue, 15 Dec 2015 20:39:02 +0000 (12:39 -0800)]
Remove the prebuilt tools cleanstep logic.
We switched to running prebuilt host tools in place in
prebuilts/sdk/tools in TARGET_BUILD_APPS build. This logic is no longer
needed.
Change-Id: Ibf88b3c0a09fb3a1a04b25403457c48851ecc6f4
Ying Wang [Tue, 15 Dec 2015 19:32:42 +0000 (19:32 +0000)]
Merge "Disable .toc optimization for host modules." am:
7b92312ea1
am:
8449b88b2e
* commit '
8449b88b2e64f49a6858ec36acca9e877585802e':
Disable .toc optimization for host modules.
Ying Wang [Tue, 15 Dec 2015 19:22:37 +0000 (19:22 +0000)]
Merge "Disable .toc optimization for host modules."
am:
7b92312ea1
* commit '
7b92312ea1184fc50b230f68214fe6ae9d3f597d':
Disable .toc optimization for host modules.
Ying Wang [Tue, 15 Dec 2015 18:56:39 +0000 (18:56 +0000)]
Merge "Disable .toc optimization for host modules."
Ying Wang [Tue, 15 Dec 2015 18:00:19 +0000 (10:00 -0800)]
Disable .toc optimization for host modules.
Host binaries may be run during the build process and the internal
implementation of the shared libraries makes a difference for the build
result. This change makes sure host tools get re-linked and re-run when
any of its dependency libraries gets updated.
DEX2OAT is such a host tool. We also changed DEX2OAT as full dependency
of dex-preoptimization, so we rebuild the odex files if DEX2OAT itself,
or any dependency libraries changed.
Bug:
24597504
Change-Id: Idf0d9be82ccebd826d9c5b405a39cff437e0af29
Shinichiro Hamaji [Tue, 15 Dec 2015 16:17:56 +0000 (08:17 -0800)]
Merge "Reduce unnecessary rebuilds of .dex files with restat=1" am:
542aa57f1d
am:
0d4a0a9dd5
* commit '
0d4a0a9dd5c1f3528b611862cb9fa81313028d1b':
Reduce unnecessary rebuilds of .dex files with restat=1
Shinichiro Hamaji [Tue, 15 Dec 2015 16:05:10 +0000 (16:05 +0000)]
Merge "Reduce unnecessary rebuilds of .dex files with restat=1"
am:
542aa57f1d
* commit '
542aa57f1d48b1a8f4afa71d6635f8ed93c82289':
Reduce unnecessary rebuilds of .dex files with restat=1
Than McIntosh [Tue, 15 Dec 2015 14:22:06 +0000 (09:22 -0500)]
Re-enable gold linker for aarch64.
Turn back on ld.gold and W-l,--icf=safe for
aarch64, now that the prebuilt ld.gold has been updated
with support for reloc 311/312 (fixed upstream, see
https://sourceware.org/bugzilla/show_bug.cgi?id=19042)
Bug:
25642296
Bug:
26153840
Change-Id: Idceb357a48d9da4eec38ab8f2103245d500622ae
Nicolas Geoffray [Tue, 15 Dec 2015 11:26:15 +0000 (11:26 +0000)]
Merge "Revert "Revert "Make PIC and PREOPT default for all."""
Nicolas Geoffray [Tue, 15 Dec 2015 09:53:05 +0000 (09:53 +0000)]
Revert "Revert "Make PIC and PREOPT default for all.""
bug:
25801231
This reverts commit
f2a9135ed14a59da38a65a0218e8e8486620a3ad.
Change-Id: I2eca605212b78505667af1f7e9c83f5cca5db35a
Shinichiro Hamaji [Tue, 15 Dec 2015 06:27:31 +0000 (06:27 +0000)]
Merge "Reduce unnecessary rebuilds of .dex files with restat=1"
Elliott Hughes [Mon, 14 Dec 2015 23:30:05 +0000 (23:30 +0000)]
Merge "Turn on stack protector for mips64." am:
6725b4b004
am:
b96f6bad55
* commit '
b96f6bad55c7d4a0a2151e34e624f1b817b4aff6':
Turn on stack protector for mips64.
Elliott Hughes [Mon, 14 Dec 2015 23:29:50 +0000 (23:29 +0000)]
Merge "Turn on stack protector for mips." am:
391caae952
am:
0391338750
* commit '
03913387507ad37e9eaaf7bcc4ec37053191bee8':
Turn on stack protector for mips.
Elliott Hughes [Mon, 14 Dec 2015 23:13:48 +0000 (23:13 +0000)]
Merge "Turn on stack protector for mips64."
am:
6725b4b004
* commit '
6725b4b004b45cd4cf3ed2ebdb40daf194e0b733':
Turn on stack protector for mips64.
Elliott Hughes [Mon, 14 Dec 2015 23:13:31 +0000 (23:13 +0000)]
Merge "Turn on stack protector for mips."
am:
391caae952
* commit '
391caae9528a5e7cc77763be6f456bd01325f66e':
Turn on stack protector for mips.
Elliott Hughes [Mon, 14 Dec 2015 22:48:38 +0000 (22:48 +0000)]
Merge "Turn on stack protector for mips64."
Elliott Hughes [Mon, 14 Dec 2015 22:46:38 +0000 (14:46 -0800)]
Turn on stack protector for mips64.
Go straight to -fstack-protector-strong, since it works to boot the emulator.
Change-Id: I2b65a0ab4426856ae05f66c1e294951e45bd72b6
Elliott Hughes [Mon, 14 Dec 2015 22:46:23 +0000 (22:46 +0000)]
Merge "Turn on stack protector for mips."
Elliott Hughes [Mon, 14 Dec 2015 22:33:29 +0000 (22:33 +0000)]
Merge "Enable -fstack-protector-strong for x86-64." am:
02191c97ef
am:
d3eae50874
* commit '
d3eae508740ef71d60844b8149544fb7b637b09a':
Enable -fstack-protector-strong for x86-64.
Elliott Hughes [Mon, 14 Dec 2015 22:33:16 +0000 (22:33 +0000)]
Merge "Be smarter about stack-protector on the host." am:
19e85a25ee
am:
39d848b1b4
* commit '
39d848b1b4a00ba7bc79242f746197e39d878310':
Be smarter about stack-protector on the host.
Elliott Hughes [Mon, 14 Dec 2015 22:15:12 +0000 (14:15 -0800)]
Turn on stack protector for mips.
Go straight to -fstack-protector-strong, since it works to boot the emulator.
Change-Id: Ie44abd869355d2163dec7d9e2635b26b45255df6
Elliott Hughes [Mon, 14 Dec 2015 21:54:03 +0000 (13:54 -0800)]
Merge "Enable -fstack-protector-strong for x86-64."
am:
02191c97ef
* commit '
02191c97effe88dddfd60b365a9c408861ba8870':
Enable -fstack-protector-strong for x86-64.
Elliott Hughes [Mon, 14 Dec 2015 21:53:53 +0000 (13:53 -0800)]
Merge "Be smarter about stack-protector on the host."
am:
19e85a25ee
* commit '
19e85a25eefe5fbb12a7121a6b87a0e5d87be39b':
Be smarter about stack-protector on the host.
Elliott Hughes [Mon, 14 Dec 2015 21:45:40 +0000 (21:45 +0000)]
Merge "Enable -fstack-protector-strong for x86-64."
Elliott Hughes [Mon, 14 Dec 2015 21:41:58 +0000 (21:41 +0000)]
Merge "Be smarter about stack-protector on the host."
Elliott Hughes [Mon, 14 Dec 2015 21:20:59 +0000 (13:20 -0800)]
Be smarter about stack-protector on the host.
Some projects are still built with our host GCC 4.8, which doesn't
support -fstack-protector-strong. The combo .mk files are used by
GCC and clang, so it's not safe to turn on -fstack-protector-strong
there. Instead, do it in the clang-specific .mk for now.
We can clean this up when elfutils (the last code built for the host
with GCC that I'm aware of) is built by clang. We'll be able to
remove the host GCC prebuilts too!
Change-Id: I314b9eab071c132a8e2cb8cc779a75ae8abb12e2
Elliott Hughes [Mon, 14 Dec 2015 21:20:46 +0000 (13:20 -0800)]
Merge "Enable -fstack-protector-strong for x86." am:
7abad39b78
am:
49d443b6f7
* commit '
49d443b6f717bc57371bf6dde950c9c5a7427151':
Enable -fstack-protector-strong for x86.
Elliott Hughes [Mon, 14 Dec 2015 21:16:22 +0000 (13:16 -0800)]
Merge "Enable -fstack-protector-strong for x86."
am:
7abad39b78
* commit '
7abad39b78225d2517bc46dff3192ea001184947':
Enable -fstack-protector-strong for x86.
Elliott Hughes [Mon, 14 Dec 2015 21:05:21 +0000 (21:05 +0000)]
Merge "Enable -fstack-protector-strong for x86."
Elliott Hughes [Mon, 14 Dec 2015 20:47:54 +0000 (12:47 -0800)]
Merge "Enable -fstack-protector-strong for the host." am:
a4b3d20d28
am:
3313f0b094
* commit '
3313f0b094c29ef51a177eff710ff2f6644d20ff':
Enable -fstack-protector-strong for the host.
Elliott Hughes [Mon, 14 Dec 2015 20:44:02 +0000 (12:44 -0800)]
Merge "Enable -fstack-protector-strong for the host."
am:
a4b3d20d28
* commit '
a4b3d20d28da1f86dde6063b732c75cf238976ee':
Enable -fstack-protector-strong for the host.
Elliott Hughes [Mon, 14 Dec 2015 20:31:10 +0000 (20:31 +0000)]
Merge "Enable -fstack-protector-strong for the host."
Elliott Hughes [Mon, 14 Dec 2015 19:16:20 +0000 (11:16 -0800)]
Enable -fstack-protector-strong for x86-64.
This results in nearly all functions with the possibility of stack
corruption getting stack canaries, because it applies to any function
taking a reference to the frame or with a local array rather than just
the functions with arrays larger than 8 bytes. It was developed for use
in Chrome (and Chrome OS) and has also been adopted by various other
distributions (Arch, Fedora, Ubuntu, etc).
The code size increase ranges from ~1.5% to ~2.5%, compared to ~0.3% to
~0.7% with the more conservative switch. The increase in the performance
loss is usually minimal. The overall size increase once everything other
than C and C++ code is taken into account is minimal, and it greatly
improves the mitigation of stack buffer overflow vulnerabilities.
https://lwn.net/Articles/584225/
Change-Id: I3ce7a73c5cf36eba5c74df37367f3d3475b0a4ed
Elliott Hughes [Mon, 14 Dec 2015 19:15:15 +0000 (11:15 -0800)]
Enable -fstack-protector-strong for x86.
This results in nearly all functions with the possibility of stack
corruption getting stack canaries, because it applies to any function
taking a reference to the frame or with a local array rather than just
the functions with arrays larger than 8 bytes. It was developed for use
in Chrome (and Chrome OS) and has also been adopted by various other
distributions (Arch, Fedora, Ubuntu, etc).
The code size increase ranges from ~1.5% to ~2.5%, compared to ~0.3% to
~0.7% with the more conservative switch. The increase in the performance
loss is usually minimal. The overall size increase once everything other
than C and C++ code is taken into account is minimal, and it greatly
improves the mitigation of stack buffer overflow vulnerabilities.
https://lwn.net/Articles/584225/
Change-Id: I55a9fdbf5777ccdeed9f2e9a23c73bb94ad7b646
Elliott Hughes [Mon, 14 Dec 2015 19:14:21 +0000 (11:14 -0800)]
Enable -fstack-protector-strong for the host.
This results in nearly all functions with the possibility of stack
corruption getting stack canaries, because it applies to any function
taking a reference to the frame or with a local array rather than just
the functions with arrays larger than 8 bytes. It was developed for use
in Chrome (and Chrome OS) and has also been adopted by various other
distributions (Arch, Fedora, Ubuntu, etc).
The code size increase ranges from ~1.5% to ~2.5%, compared to ~0.3% to
~0.7% with the more conservative switch. The increase in the performance
loss is usually minimal. The overall size increase once everything other
than C and C++ code is taken into account is minimal, and it greatly
improves the mitigation of stack buffer overflow vulnerabilities.
https://lwn.net/Articles/584225/
Change-Id: I97a2187cebac64e3b9f22b691d4676b6da083ebd
Ian Pedowitz [Mon, 14 Dec 2015 18:28:33 +0000 (18:28 +0000)]
Merge "Revert "Make PIC and PREOPT default for all.""
Nicolas Geoffray [Mon, 14 Dec 2015 18:22:17 +0000 (18:22 +0000)]
Revert "Make PIC and PREOPT default for all."
Need to update seed and ariel.
This reverts commit
b93f5905d268b8745dac1689f0871fa5c5b28315.
Change-Id: Icc6f1539a97ccb2b1fcb12d2bc48904045689096
Nicolas Geoffray [Mon, 14 Dec 2015 13:55:22 +0000 (13:55 +0000)]
Merge "Make PIC and PREOPT default for all."
Nicolas Geoffray [Fri, 11 Dec 2015 11:35:39 +0000 (11:35 +0000)]
Make PIC and PREOPT default for all.
bug:
25888050
bug:
25801231
Change-Id: Idf0f466a00dd592c433fc798c29ed80396015713
Shinichiro Hamaji [Wed, 9 Dec 2015 09:06:20 +0000 (18:06 +0900)]
Reduce unnecessary rebuilds of .dex files with restat=1
The .dex.toc files are created by dexdump, which outputs all
information in a .dex file which may affect compilation of
other modules.
For prebuilt java libraries and static java libraries, we'll
output empty .toc files and don't set restat=1. .dex.toc files
are necessary even for static java libraries because they can
be referenced by LOCAL_JAVA_LIBRARIES (instead of
LOCAL_STATIC_JAVA_LIBRARIES).
We don't use this optimization for apps build. We cannot build
dexdump for apps build due to lack of libc++.
Performance:
$ m && touch \
frameworks/base/core/java/com/google/android/util/Procedure.java \
&& time m
Before: 3m48s
After: 1m46s
Bug:
24597504
Change-Id: Id1665923b414dee705dc60af4c021390a19ea26f
Stephen Hines [Sun, 13 Dec 2015 23:13:26 +0000 (15:13 -0800)]
Merge "Revert "Change USE_CLANG_PLATFORM_BUILD default to true."" am:
eca3206abb
am:
67b6cc2201
* commit '
67b6cc2201f41508ea36bd0943aef545a68a679f':
Revert "Change USE_CLANG_PLATFORM_BUILD default to true."
Stephen Hines [Sun, 13 Dec 2015 23:10:18 +0000 (15:10 -0800)]
Merge "Revert "Change USE_CLANG_PLATFORM_BUILD default to true.""
am:
eca3206abb
* commit '
eca3206abbf2223d6bc6c1c4337c911077fc2897':
Revert "Change USE_CLANG_PLATFORM_BUILD default to true."
Stephen Hines [Sun, 13 Dec 2015 23:06:03 +0000 (23:06 +0000)]
Merge "Revert "Change USE_CLANG_PLATFORM_BUILD default to true.""
Stephen Hines [Sun, 13 Dec 2015 22:58:22 +0000 (22:58 +0000)]
Revert "Change USE_CLANG_PLATFORM_BUILD default to true."
This reverts commit
3c8036da538bbbf259ae4d56cc808943398cc45b.
Change-Id: I930bbebce8396d7c0abd847530640a696d3418e7
Nick Kralevich [Sun, 13 Dec 2015 21:16:09 +0000 (13:16 -0800)]
Merge "sepolicy: Fix \'avc denied\' issues for the emulators" am:
154657f0e3
am:
abfd39ae3a
* commit '
abfd39ae3ae34bc4208f23aa040a406c1d7358be':
sepolicy: Fix 'avc denied' issues for the emulators
Dan Albert [Sun, 13 Dec 2015 21:14:37 +0000 (13:14 -0800)]
Merge "Use lib64 for mips64 as well." am:
6674573897
am:
3340159339
* commit '
33401593392cf903cb3228a7a998f91a7e392be0':
Use lib64 for mips64 as well.
Nick Kralevich [Sat, 12 Dec 2015 01:14:51 +0000 (17:14 -0800)]
Merge "sepolicy: Fix \'avc denied\' issues for the emulators"
am:
154657f0e3
* commit '
154657f0e371a3ff180e8b0936aeaa3d2da9a57c':
sepolicy: Fix 'avc denied' issues for the emulators
Nick Kralevich [Sat, 12 Dec 2015 01:07:07 +0000 (01:07 +0000)]
Merge "sepolicy: Fix 'avc denied' issues for the emulators"
Dan Albert [Sat, 12 Dec 2015 00:21:35 +0000 (16:21 -0800)]
Merge "Use lib64 for mips64 as well."
am:
6674573897
* commit '
667457389791a505660e102bc2bdde1362543e37':
Use lib64 for mips64 as well.
Dan Albert [Sat, 12 Dec 2015 00:09:16 +0000 (00:09 +0000)]
Merge "Use lib64 for mips64 as well."
Dan Albert [Fri, 11 Dec 2015 20:49:18 +0000 (12:49 -0800)]
Use lib64 for mips64 as well.
This was previously working because for some reason prebuilts/ndk had
a tangled mess of hand assembled symlinks that pointed lib -> lib64
for the multilib architectures.
Change-Id: I294d67f58f2008b1a53790cf676f5223df449cbc
Dan Willemsen [Fri, 11 Dec 2015 22:55:18 +0000 (14:55 -0800)]
Merge "Enforce linker version-scripts are valid" am:
e223965f0c
am:
33b4913adf
* commit '
33b4913adf0e664fc63fbf366c78e9dff3bab170':
Enforce linker version-scripts are valid
Dan Willemsen [Fri, 11 Dec 2015 21:05:28 +0000 (13:05 -0800)]
Merge "Enforce linker version-scripts are valid"
am:
e223965f0c
* commit '
e223965f0c26c1cba020a47cb41ba109dd308db8':
Enforce linker version-scripts are valid
Dan Willemsen [Fri, 11 Dec 2015 20:58:03 +0000 (20:58 +0000)]
Merge "Enforce linker version-scripts are valid"
Andy Hung [Fri, 11 Dec 2015 20:08:51 +0000 (20:08 +0000)]
Merge "Add audioserver executable to base config"
Alex Klyubin [Fri, 11 Dec 2015 18:47:26 +0000 (10:47 -0800)]
Merge "Make signapk use Conscrypt." am:
7884a63731
am:
dfd2199ef6
* commit '
dfd2199ef66dcc162a0165f9a34652ae2877538d':
Make signapk use Conscrypt.
Alex Klyubin [Fri, 11 Dec 2015 18:37:16 +0000 (10:37 -0800)]
Merge "Make signapk use Conscrypt."
am:
7884a63731
* commit '
7884a63731a876f483c13288c87d8e7af7a533e4':
Make signapk use Conscrypt.
Alex Klyubin [Fri, 11 Dec 2015 18:29:36 +0000 (18:29 +0000)]
Merge "Make signapk use Conscrypt."
Chih-hung Hsieh [Fri, 11 Dec 2015 18:25:29 +0000 (10:25 -0800)]
Merge "Change USE_CLANG_PLATFORM_BUILD default to true." am:
eb486309d8
am:
a3fbb3b0e4
* commit '
a3fbb3b0e49bfbec697f73d4c4e77bb12f8e348e':
Change USE_CLANG_PLATFORM_BUILD default to true.