OSDN Git Service
Gina Dimino [Wed, 6 Jan 2016 17:41:52 +0000 (17:41 +0000)]
Merge "Docs: Encode URL input to search box Bug:
26287939"
am:
634e4a2a39
* commit '
634e4a2a39b32df838d750374ce390fa25f1710b':
Docs: Encode URL input to search box Bug:
26287939
Gina Dimino [Wed, 6 Jan 2016 17:37:04 +0000 (17:37 +0000)]
Merge "Docs: Encode URL input to search box Bug:
26287939"
Gina Dimino [Tue, 5 Jan 2016 23:00:36 +0000 (15:00 -0800)]
Docs: Encode URL input to search box
Bug:
26287939
Change-Id: Ica656034412b517e182333f5fe4f6e9bc5f300f3
Elliott Hughes [Tue, 5 Jan 2016 17:48:29 +0000 (17:48 +0000)]
Merge "Clean up Mac OS hacks in acp slightly."
am:
0e80edd259
* commit '
0e80edd259d1ce7f35d8c9841f88296416c1e2cf':
Clean up Mac OS hacks in acp slightly.
Elliott Hughes [Tue, 5 Jan 2016 17:36:09 +0000 (17:36 +0000)]
Merge "Clean up Mac OS hacks in acp slightly."
Elliott Hughes [Tue, 5 Jan 2016 17:26:54 +0000 (09:26 -0800)]
Clean up Mac OS hacks in acp slightly.
Change-Id: I7cba3a345cd8907ae050961cc4f173003ac90f39
Narayan Kamath [Tue, 5 Jan 2016 17:19:15 +0000 (17:19 +0000)]
Merge "CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO"
am:
b11bf3f70c
* commit '
b11bf3f70cfefd170fb4d668b9b8fabadd8959e1':
CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO
Narayan Kamath [Tue, 5 Jan 2016 17:15:35 +0000 (17:15 +0000)]
Merge "CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO"
Narayan Kamath [Tue, 5 Jan 2016 16:16:37 +0000 (16:16 +0000)]
CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO
This was never defined anywhere and only Windows doesn't have
a valid st_ino field on struct stat.
bug:
26355387
Change-Id: I40b8779606057281e2e6a2723ef93cd2f2d99a68
Dan Willemsen [Tue, 5 Jan 2016 05:52:06 +0000 (05:52 +0000)]
Merge "Prevent changes to COMMON_GLOBAL_C(PP)FLAGS"
am:
d443abf1aa
* commit '
d443abf1aaa12c1b0fb82c940df60046c06aaed7':
Prevent changes to COMMON_GLOBAL_C(PP)FLAGS
Dan Willemsen [Tue, 5 Jan 2016 05:47:43 +0000 (05:47 +0000)]
Merge "Prevent changes to COMMON_GLOBAL_C(PP)FLAGS"
Tao Bao [Mon, 4 Jan 2016 19:51:30 +0000 (19:51 +0000)]
Merge "Build delta_generator for A/B update."
am:
bf4213ebae
* commit '
bf4213ebaee1c505fa5070419aba4cd5ddccaae2':
Build delta_generator for A/B update.
Tao Bao [Mon, 4 Jan 2016 19:46:55 +0000 (19:46 +0000)]
Merge "Build delta_generator for A/B update."
Tao Bao [Mon, 4 Jan 2016 17:57:32 +0000 (09:57 -0800)]
Build delta_generator for A/B update.
delta_generator computes the OTA package (aka payload) for A/B update.
Also add its dependent libraries into otatools.zip.
Bug:
25715402
Change-Id: Iddf4b9ac188cc4c8bf3f89ce3641d68451632ba1
Christopher Wiley [Mon, 4 Jan 2016 17:02:44 +0000 (17:02 +0000)]
Merge "Fix compiler warnings on Windows in CopyFile.c"
am:
b327f61f50
* commit '
b327f61f50c5bf42dc61f5d1bc946f7e4edb7ccf':
Fix compiler warnings on Windows in CopyFile.c
Christopher Wiley [Mon, 4 Jan 2016 16:59:58 +0000 (16:59 +0000)]
Merge "Fix compiler warnings on Windows in CopyFile.c"
Christopher Wiley [Wed, 30 Dec 2015 20:24:40 +0000 (12:24 -0800)]
Fix compiler warnings on Windows in CopyFile.c
direct.h declares _mkdir() on Windows.
Prevent future compiler warnings with -Wall and -Werror.
Bug:
26355209
Test: `mmma -j30 build/libs/host` for aosp_arm64-eng is successful.
Change-Id: I6d6e4edca98bef57d62829e9d1ef4e2a96cdad3d
Christopher Wiley [Wed, 30 Dec 2015 19:09:42 +0000 (19:09 +0000)]
Merge "Fix unused parameter warnings in CopyFile.c"
am:
530d99446a
* commit '
530d99446a02912387ea45c1d1d35a7d1bd39829':
Fix unused parameter warnings in CopyFile.c
Christopher Wiley [Wed, 30 Dec 2015 19:06:32 +0000 (19:06 +0000)]
Merge "Fix unused parameter warnings in CopyFile.c"
Christopher Wiley [Wed, 30 Dec 2015 18:43:22 +0000 (10:43 -0800)]
Fix unused parameter warnings in CopyFile.c
Bug:
26355209
Test: Compiles
Change-Id: I6f804f150ec08de5a1b3272ae59bc921dd6d0c9c
Narayan Kamath [Wed, 30 Dec 2015 11:47:12 +0000 (11:47 +0000)]
Merge "Revert "Temporary workaround to build bouncycastle / nist-pkits""
am:
54a5e368fe
* commit '
54a5e368fea461a265374db9ecf2c0b4c6825460':
Revert "Temporary workaround to build bouncycastle / nist-pkits"
Narayan Kamath [Wed, 30 Dec 2015 11:43:35 +0000 (11:43 +0000)]
Merge "Revert "Temporary workaround to build bouncycastle / nist-pkits""
Narayan Kamath [Thu, 24 Dec 2015 12:39:51 +0000 (12:39 +0000)]
Revert "Temporary workaround to build bouncycastle / nist-pkits"
This reverts commit
3006881f84c9abf1ab85b77ecd4e815c4cb880d0.
Narayan Kamath [Thu, 24 Dec 2015 12:04:50 +0000 (12:04 +0000)]
Merge changes from topic \'aosp-merge-24-12\'
am:
8b9589216d
* commit '
8b9589216dd8c2a644dab9623952b5fd8a32e550':
Temporary workaround to build bouncycastle / nist-pkits
Build: Build changes for multi oat/image support.
Allow modules to override the default NOTICE file.
Track introduction of libopenjdkjvm.
Allow for 5200 words in dump-words-to-file
Update the package whitelist for the boot image.
Use core-oj alongside core-libart wherever required.
Narayan Kamath [Thu, 24 Dec 2015 11:56:45 +0000 (11:56 +0000)]
Merge changes from topic 'aosp-merge-24-12'
* changes:
Temporary workaround to build bouncycastle / nist-pkits
Build: Build changes for multi oat/image support.
Allow modules to override the default NOTICE file.
Track introduction of libopenjdkjvm.
Allow for 5200 words in dump-words-to-file
Update the package whitelist for the boot image.
Use core-oj alongside core-libart wherever required.
Narayan Kamath [Thu, 24 Dec 2015 11:35:24 +0000 (11:35 +0000)]
Temporary workaround to build bouncycastle / nist-pkits
Change-Id: I20bb834f08eeff03f627ab7d8f422a5ba9f3eb1a
Jeff Hao [Thu, 17 Dec 2015 01:20:11 +0000 (17:20 -0800)]
Build: Build changes for multi oat/image support.
Use the --multi-image option to generate a preopted boot image. This
generates a separate oat file and image file output for each dex file
input.
Stop inlining core.
(cherry picked from commit
d1d3fd933f3d79dfffc12c68a21ae1a1e1b21cc0)
Change-Id: Ibd23bc06d346ff404cabd88f7461f041af6016dd
Narayan Kamath [Tue, 22 Dec 2015 14:34:09 +0000 (14:34 +0000)]
Allow modules to override the default NOTICE file.
It's useful in projects where different top level modules have
different licenses associated with them.
(cherry picked from commit
3026f4daf11b2d4729559d49624e748a82f15495)
Change-Id: I71b20d6f979c0f50562f4f44b2af1f3ec2909444
Narayan Kamath [Fri, 18 Dec 2015 11:10:53 +0000 (11:10 +0000)]
Track introduction of libopenjdkjvm.
(cherry picked from commit
2eb52037e8c06473d0d8de7fb68acc5beccdc6ba)
Change-Id: Ib8683d7e628ae4b09f359ecedc93f77199205cef
Przemyslaw Szczepaniak [Fri, 20 Nov 2015 15:05:03 +0000 (15:05 +0000)]
Allow for 5200 words in dump-words-to-file
After switching to OpenJdk, doc-comment-check target
started to fail due to "Too many words (5082)" while
generating out/target/common/docs/doc-comment-check-timestamp.rsp
This change extends number of dumped words to 5200.
Bug:
25758743
(cherry picked from commit
972a2681c6cb1992886195b9e69234ef786cb876)
Change-Id: I9b8516d1e7c113d667dcfb7963ee352972677afa
Narayan Kamath [Tue, 17 Nov 2015 18:34:53 +0000 (18:34 +0000)]
Update the package whitelist for the boot image.
.. to track the inclusion of OpenJdk.
(cherry picked from commit
b3c9e4a22ee6d32a99a5c9a7b833e2644a690c82)
Change-Id: Ie7277a0403dee9ccd114d9dcb7bf95cdaf5688a0
Piotr Jastrzebski [Tue, 17 Feb 2015 16:55:52 +0000 (16:55 +0000)]
Use core-oj alongside core-libart wherever required.
With some core classes moved to separate core-oj jar
we need to use the new jar.
(cherry picked from commit
89b94c827f92e107b286ab60876ff9f75ba22a33)
Change-Id: I025c0adc70535bf23def3ab0ce28a1bfaef72514
Nick Kralevich [Wed, 23 Dec 2015 20:27:00 +0000 (20:27 +0000)]
Merge "set ro.adb.secure=1 for user builds"
am:
f9911ae087
* commit '
f9911ae087189c26e0ef8a2334233116a8944aa7':
set ro.adb.secure=1 for user builds
Nick Kralevich [Wed, 23 Dec 2015 20:22:30 +0000 (20:22 +0000)]
Merge "set ro.adb.secure=1 for user builds"
Daniel Micay [Wed, 16 Dec 2015 21:42:49 +0000 (16:42 -0500)]
set ro.adb.secure=1 for user builds
In user builds, adb without authentication is always disabled. However,
it doesn't work with the defaults because authentication doesn't work
without having ro.adb.secure=1 set. It makes sense to offer builds with
no adb but not builds with adb present in an unusable state (especially
as the default).
Bug:
22220212
Bug:
21862859
Change-Id: Ic22300a70586fd57692ac59d6873ab16dde70919
Tao Bao [Tue, 22 Dec 2015 22:27:04 +0000 (14:27 -0800)]
Merge "Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP."
am:
9d4dbe09ed
* commit '
9d4dbe09edcaeccd461138b5aefceb76759f5fd9':
Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP.
Tao Bao [Tue, 22 Dec 2015 22:22:44 +0000 (22:22 +0000)]
Merge "Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP."
Dan Willemsen [Tue, 22 Dec 2015 22:15:47 +0000 (14:15 -0800)]
Merge "Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST"
am:
d52953e9ed
* commit '
d52953e9ed3a9625a61548234575acd4f0bbe87a':
Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST
Dan Willemsen [Tue, 22 Dec 2015 22:05:30 +0000 (22:05 +0000)]
Merge "Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST"
Tao Bao [Tue, 22 Dec 2015 17:47:46 +0000 (09:47 -0800)]
Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP.
Change-Id: I6909d4572bd54da48f7fd6b76d4a5ee03c84206c
Yohann Roussel [Tue, 22 Dec 2015 14:03:54 +0000 (14:03 +0000)]
Merge "Always start jack server before first call to jack"
am:
4a01711267
* commit '
4a017112672901130c7ceb6c778f1ca243f2dd49':
Always start jack server before first call to jack
Yohann Roussel [Tue, 22 Dec 2015 13:59:49 +0000 (13:59 +0000)]
Merge "Always start jack server before first call to jack"
Dan Willemsen [Tue, 22 Dec 2015 00:34:25 +0000 (16:34 -0800)]
Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST
The target BUILD_NATIVE_TEST defaults to building both 32 and 64-bit
versions of the tests. Many of our host tests have opted into this
manually, but some have not. Switch the default on the host tests to
stay consistent.
To preserve script compatibility, a symlink remains pointing to the
binary that would have been built before this change.
Change-Id: I9585984e933c2ac36134fc1968736c0bb5fea7be
Shinichiro Hamaji [Mon, 21 Dec 2015 23:07:15 +0000 (23:07 +0000)]
Merge "Do not use 0 in recipe"
am:
67e960b70f
* commit '
67e960b70ff0c07a3ba817a687791cab538ceb66':
Do not use $? in recipe
Shinichiro Hamaji [Mon, 21 Dec 2015 22:46:01 +0000 (22:46 +0000)]
Merge "Do not use $? in recipe"
Tao Bao [Mon, 21 Dec 2015 19:22:00 +0000 (19:22 +0000)]
Merge "Allow building recovery as boot."
am:
781b7b20d4
* commit '
781b7b20d41cfe80472707aec46d0eac5473bfc5':
Allow building recovery as boot.
Tao Bao [Mon, 21 Dec 2015 19:17:56 +0000 (19:17 +0000)]
Merge "Allow building recovery as boot."
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
(cherry picked from commit
d80bef2b9e7aa5f92ab017247442798f47736566)
Evgenii Stepanov [Mon, 21 Dec 2015 18:37:35 +0000 (18:37 +0000)]
Merge "Remove RPATH for AddressSanitizer."
am:
18733b9b0c
* commit '
18733b9b0c2a1c3b9b6a2808497f47be076c9561':
Remove RPATH for AddressSanitizer.
Evgenii Stepanov [Mon, 21 Dec 2015 18:32:36 +0000 (18:32 +0000)]
Merge "Remove RPATH for AddressSanitizer."
Evgenii Stepanov [Mon, 21 Dec 2015 18:29:54 +0000 (10:29 -0800)]
Remove RPATH for AddressSanitizer.
RPATH was used in order for ASan executables to prefer ASan libraries
under /data. Now ASan executables use a special loader (linker_asan),
which implements this logic. RPATH is no longer needed.
Change-Id: Ic7a39b022267b80bd0ce3e95a2e822eb308a1fba
Shinichiro Hamaji [Fri, 18 Dec 2015 06:50:10 +0000 (15:50 +0900)]
Do not use $? in recipe
Kati cannot support this automatic variable as ninja doesn't
have a feature for this.
Change-Id: Ibc3a18dc5739b5008b156d2672a626621e046f5a
Yohann Roussel [Mon, 21 Dec 2015 13:01:36 +0000 (05:01 -0800)]
Merge "Do not set Jack source version, use default"
am:
2983fd4b0f
* commit '
2983fd4b0f66e58620afd57d5f68794c0767b641':
Do not set Jack source version, use default
Yohann Roussel [Mon, 21 Dec 2015 12:57:29 +0000 (12:57 +0000)]
Merge "Do not set Jack source version, use default"
Sami Tolvanen [Mon, 21 Dec 2015 11:30:44 +0000 (11:30 +0000)]
Merge "build_image: don\'t call append2simg for FEC"
am:
e2476f82a1
* commit '
e2476f82a1c83c5efda8d8e29d25305439e91985':
build_image: don't call append2simg for FEC
Sami Tolvanen [Mon, 21 Dec 2015 11:30:35 +0000 (11:30 +0000)]
Merge "build_image: remove an unnecessary call to append2simg"
am:
06b4ff6696
* commit '
06b4ff6696dfc11fafde52e17c6e9d46f0ec1be5':
build_image: remove an unnecessary call to append2simg
Sami Tolvanen [Mon, 21 Dec 2015 11:21:16 +0000 (11:21 +0000)]
Merge "build_image: don't call append2simg for FEC"
Sami Tolvanen [Mon, 21 Dec 2015 11:19:26 +0000 (11:19 +0000)]
Merge "build_image: remove an unnecessary call to append2simg"
Shinichiro Hamaji [Mon, 21 Dec 2015 05:51:26 +0000 (05:51 +0000)]
Merge "Disable goma/ccache with USE_XXX=false"
am:
6c90e49f4a
* commit '
6c90e49f4a70e100a56e2a1b2f2550a782c72311':
Disable goma/ccache with USE_XXX=false
Shinichiro Hamaji [Mon, 21 Dec 2015 05:48:44 +0000 (05:48 +0000)]
Merge "Disable goma/ccache with USE_XXX=false"
Elliott Hughes [Fri, 18 Dec 2015 21:45:31 +0000 (13:45 -0800)]
Merge "Enable -fstack-protector-strong for arm64."
am:
03b7effb8d
* commit '
03b7effb8d018eb248fed9e6856a7b8795cdb907':
Enable -fstack-protector-strong for arm64.
Elliott Hughes [Fri, 18 Dec 2015 21:45:23 +0000 (13:45 -0800)]
Merge "Enable -fstack-protector-strong for arm."
am:
7fca8a373f
* commit '
7fca8a373f9885d4cb23145a5b457d7f2f1c5f22':
Enable -fstack-protector-strong for arm.
Alex Klyubin [Fri, 18 Dec 2015 21:45:16 +0000 (13:45 -0800)]
Merge "Move signapk sources to src dir."
am:
421d84f911
* commit '
421d84f911218387dc638dd7ef897aa3199b96b6':
Move signapk sources to src dir.
Elliott Hughes [Fri, 18 Dec 2015 21:36:49 +0000 (21:36 +0000)]
Merge "Enable -fstack-protector-strong for arm64."
Elliott Hughes [Fri, 18 Dec 2015 21:36:27 +0000 (21:36 +0000)]
Merge "Enable -fstack-protector-strong for arm."
Dan Willemsen [Wed, 16 Dec 2015 21:10:35 +0000 (13:10 -0800)]
Prevent changes to COMMON_GLOBAL_C(PP)FLAGS
Reorder the definitions of the core cflags so that we can prevent device
configurations from changing the global C(PP)FLAGS.
There is no reason for devices to be configuring the global cflags -- if
something needs to change for a particular device, that flag should be
defined in the BoardConfig.mk, then used in the individual makefiles
where it is needed. The common global flags also affected host tools,
which should not change between device configurations.
Bug:
26165350
Change-Id: Icece4505ce3d2a9168087d802953378534018d47
Alex Klyubin [Fri, 18 Dec 2015 18:06:37 +0000 (18:06 +0000)]
Merge "Move signapk sources to src dir."
Sami Tolvanen [Fri, 18 Dec 2015 15:50:25 +0000 (15:50 +0000)]
build_image: don't call append2simg for FEC
append2simg can be slow, so generate error correction data before verity
data is appended, and append all metadata to the image at the same time.
Needs matching changes from
I09349368925e5e2f2a7961a712a1e933eb0b9ec8
Bug:
26251929
Change-Id: Iea8cee0aee353b4d029d9581e8fbd68ec7b7dd4b
Sami Tolvanen [Fri, 18 Dec 2015 13:24:56 +0000 (13:24 +0000)]
build_image: remove an unnecessary call to append2simg
append2simg on a large image is fairly slow, so append verity metadata to
the hash tree to avoid two calls.
Bug:
26251929
Change-Id: I5ec84dcd6e8500e990af13b1f9cef5e809b41605
Yohann Roussel [Fri, 18 Dec 2015 09:30:21 +0000 (10:30 +0100)]
Do not set Jack source version, use default
Default source version is 1.7 in Jack B and Jack C so this means no
change to default. Not forcing it in the build rules will allow to
change it in LOCAL_JACK_FLAGS.
Bug:
26257295
Change-Id: If9b5fe250eea4bc6bcb3c16ad9cf7024d399ff3c
Shinichiro Hamaji [Fri, 18 Dec 2015 06:26:17 +0000 (15:26 +0900)]
Disable goma/ccache with USE_XXX=false
Bug:
26009364
Change-Id: Ic0001e6fdc62ca2373309bfe3127c5fec64d2d85
Neil Fuller [Thu, 17 Dec 2015 10:27:33 +0000 (10:27 +0000)]
Merge "Set -Xdoclint:none"
am:
d49e55561a
* commit '
d49e55561aa139af1b7c5a2f448ab5c7d93272d6':
Set -Xdoclint:none
Neil Fuller [Thu, 17 Dec 2015 10:18:28 +0000 (10:18 +0000)]
Merge "Set -Xdoclint:none"
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"
Narayan Kamath [Thu, 10 Dec 2015 22:24:39 +0000 (22:24 +0000)]
Set -Xdoclint:none
Mac builds use a javadoc tool that fails on more warnings than linux
builds. Add -Xdoclint:none to all java 8 standard doclet javadoc
commands.
Don't add it to javadoc commands that use the com.google.doclava.Doclava
doclet, it doesn't understand -Xdoclint:none.
(cherry-picked from commit
8bf7b5d51a6ff9a6d9b5cc5c21ecbf2ae5d0e804)
Change-Id: Ic5b8431ec2facb7989473b06ebe07246f6d2317f
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: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 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