OSDN Git Service
Shinichiro Hamaji [Tue, 24 Nov 2015 04:57:26 +0000 (04:57 +0000)]
Merge "Prevent findleaves.py from traversing copies of "
am:
84639d127b
* commit '
84639d127b50734ef670232bfa43a6fb9f3f0576':
Prevent findleaves.py from traversing copies of $(OUT_DIR)
Shinichiro Hamaji [Tue, 24 Nov 2015 04:54:02 +0000 (04:54 +0000)]
Merge "Prevent findleaves.py from traversing copies of $(OUT_DIR)"
Neil Fuller [Fri, 20 Nov 2015 10:20:13 +0000 (10:20 +0000)]
Merge "Use sensible default locations for Java"
am:
8f354bc8c2
* commit '
8f354bc8c2d4c27d93c7e13a853e0c9088d6ba94':
Use sensible default locations for Java
Neil Fuller [Fri, 20 Nov 2015 10:16:17 +0000 (10:16 +0000)]
Merge "Use sensible default locations for Java"
Tao Bao [Fri, 20 Nov 2015 04:50:31 +0000 (04:50 +0000)]
Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY."
am:
4ed5735a68
* commit '
4ed5735a68090e9eec240693ff6b97ea57576151':
releasetools: Fix the bug with TARGET_NO_RECOVERY.
Tao Bao [Fri, 20 Nov 2015 04:47:42 +0000 (04:47 +0000)]
Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY."
Ying Wang [Fri, 20 Nov 2015 02:38:00 +0000 (02:38 +0000)]
Merge "Increase droiddoc -J-Xmx to 1600MB."
am:
01f49a3d5e
* commit '
01f49a3d5e5d8f4fdd83d1b74a230f8160aabe08':
Increase droiddoc -J-Xmx to 1600MB.
Ying Wang [Fri, 20 Nov 2015 02:33:11 +0000 (02:33 +0000)]
Merge "Increase droiddoc -J-Xmx to 1600MB."
Ying Wang [Fri, 20 Nov 2015 02:31:01 +0000 (18:31 -0800)]
Increase droiddoc -J-Xmx to 1600MB.
As we occasionally see java.lang.OutOfMemoryError when running
doc-comment-check-docs.
Bug:
25787786
Change-Id: I6c505c96ec36d09d28d400e03027b169870c49bb
Tao Bao [Fri, 20 Nov 2015 01:05:46 +0000 (17:05 -0800)]
releasetools: Fix the bug with TARGET_NO_RECOVERY.
The packaging script is broken when we set TARGET_NO_RECOVERY and
SYSTEM_ROOT_IMAGE both. With TARGET_NO_RECOVERY set, we don't have
RECOVERY/RAMDISK/etc/recovery.fstab. It thus fails the assertion in
common.LoadRecoveryFSTab() that "/" must exist in fstab when enabling
SYSTEM_ROOT_IMAGE.
Change-Id: Id509d724f18be7cf7389dd786924ead894ac0cc1
Christopher Wiley [Thu, 19 Nov 2015 22:07:06 +0000 (22:07 +0000)]
Merge "Fix race in C++ AIDL file generation"
am:
b2055df782
* commit '
b2055df782eb5276128ef14ac4724d32f94e1aec':
Fix race in C++ AIDL file generation
Colin Cross [Thu, 19 Nov 2015 22:06:52 +0000 (22:06 +0000)]
Merge "Switch to using kati env script"
am:
7926e42209
* commit '
7926e42209b41766369e49b2093e6334564f93d4':
Switch to using kati env script
Christopher Wiley [Thu, 19 Nov 2015 22:01:27 +0000 (22:01 +0000)]
Merge "Fix race in C++ AIDL file generation"
Christopher Wiley [Thu, 19 Nov 2015 21:52:15 +0000 (13:52 -0800)]
Fix race in C++ AIDL file generation
The export_includes file for a library needs to express a dependency on
all generated exported headers. For aidl generated headers, express a
dependency on the .cpp file instead, since the generator promises to
generate this file last. Unfortunately, the C++ headers generated from
a .aidl file depend on the contents of the file.
Change-Id: I9402b364e4538b502c0958ac8c7bd72cb0add724
Colin Cross [Thu, 19 Nov 2015 21:11:01 +0000 (21:11 +0000)]
Merge "Switch to using kati env script"
Christopher Wiley [Thu, 19 Nov 2015 19:24:42 +0000 (19:24 +0000)]
Merge "Export generated AIDL headers"
am:
0c595d4730
* commit '
0c595d47304e6c00a493600b4a46f655cd148db9':
Export generated AIDL headers
Christopher Wiley [Thu, 19 Nov 2015 19:17:47 +0000 (19:17 +0000)]
Merge "Export generated AIDL headers"
Christopher Wiley [Thu, 19 Nov 2015 15:06:01 +0000 (07:06 -0800)]
Export generated AIDL headers
It is common for developers to generate/compile AIDL in a static
library, then link that library into an executable. When doing this,
developers need to export the generated headers.
Bug:
25779424
Test: a refactoring of the aidl Android.mk shows this works
Change-Id: I4f7d471a601d2a683cb5a9da5e02e3fab576c26a
Neil Fuller [Thu, 19 Nov 2015 15:51:47 +0000 (15:51 +0000)]
Use sensible default locations for Java
Use sensible default locations for Java based on
the EXPERIMENTAL_USE_JAVA8 flag.
Bug:
25786468
Change-Id: I7ec035b5329785efc41b3f971d5e3ae202293576
Stephen Hines [Thu, 19 Nov 2015 16:20:00 +0000 (16:20 +0000)]
Merge "Rename AArch64 ASan target runtime library to match upstream convention."
am:
af9e29d040
* commit '
af9e29d040dc20aeb4cceb545d864d41ecf0bca5':
Rename AArch64 ASan target runtime library to match upstream convention.
Stephen Hines [Thu, 19 Nov 2015 16:14:08 +0000 (16:14 +0000)]
Merge "Rename AArch64 ASan target runtime library to match upstream convention."
Shinichiro Hamaji [Thu, 19 Nov 2015 09:30:21 +0000 (18:30 +0900)]
Prevent findleaves.py from traversing copies of $(OUT_DIR)
by putting blank Android.mk and CleanSpec.mk in $(OUT_DIR).
Bug:
25732342
Change-Id: I3fcc4efddb9ee5ce309502e978f0589335af8371
Dan Albert [Thu, 19 Nov 2015 06:33:50 +0000 (06:33 +0000)]
Merge "Really allow overriding the LLVM prebuilts path."
am:
ec18c0fdfe
* commit '
ec18c0fdfe0475cb4eff2458cf1f825d37fbc2b5':
Really allow overriding the LLVM prebuilts path.
Stephen Hines [Thu, 19 Nov 2015 06:13:16 +0000 (22:13 -0800)]
Rename AArch64 ASan target runtime library to match upstream convention.
Rename from
libclang_rt.asan-arm64-android.so
to
libclang_rt.asan-aarch64-android.so
Change-Id: I6d73f458f437440c1de5bc72d2188d392c80cb98
Dan Albert [Thu, 19 Nov 2015 06:04:30 +0000 (06:04 +0000)]
Merge "Really allow overriding the LLVM prebuilts path."
Dan Albert [Thu, 19 Nov 2015 02:00:40 +0000 (18:00 -0800)]
Really allow overriding the LLVM prebuilts path.
Not sure why my previous testing was working without this, but kati is
a bit pickier about ?= vs :=.
Change-Id: I80243a3c93dec7fd9b8e6f92e2c6cc956706ace0
Colin Cross [Tue, 17 Nov 2015 21:36:45 +0000 (21:36 +0000)]
Merge "Support LOCAL_ACP_UNAVAILABLE for prebuilts"
am:
153af5a27e
* commit '
153af5a27e48627c24bda68495d1a972c744aa00':
Support LOCAL_ACP_UNAVAILABLE for prebuilts
Colin Cross [Tue, 17 Nov 2015 21:25:44 +0000 (21:25 +0000)]
Merge "Support LOCAL_ACP_UNAVAILABLE for prebuilts"
Colin Cross [Mon, 9 Nov 2015 22:21:12 +0000 (14:21 -0800)]
Switch to using kati env script
Kati generates a shell script to run ninja, but that makes it difficult
to customize the ninja command line. Switch to sourcing the new env
script and then starting ninja manually.
Change-Id: I7139290a463018ddf5e05b4d61a0d2f18b1a2247
Tao Bao [Tue, 17 Nov 2015 05:37:01 +0000 (05:37 +0000)]
Merge "releasetools: Pack updatable images into IMAGES/ for A/B update."
am:
128466cea5
* commit '
128466cea5358eadbde19f52f16eef03f2685446':
releasetools: Pack updatable images into IMAGES/ for A/B update.
Tao Bao [Tue, 17 Nov 2015 05:32:56 +0000 (05:32 +0000)]
Merge "releasetools: Pack updatable images into IMAGES/ for A/B update."
Ying Wang [Tue, 17 Nov 2015 02:50:36 +0000 (02:50 +0000)]
Merge "Remove unnecessary inheritance layer between aliases."
am:
2f05af74bc
* commit '
2f05af74bce1fce1adc53090f46d38888c8232c4':
Remove unnecessary inheritance layer between aliases.
Ying Wang [Tue, 17 Nov 2015 02:45:38 +0000 (02:45 +0000)]
Merge "Remove unnecessary inheritance layer between aliases."
Colin Cross [Tue, 17 Nov 2015 01:43:11 +0000 (17:43 -0800)]
Support LOCAL_ACP_UNAVAILABLE for prebuilts
Files built by soong will be installed using BUILD_PREBUILT, and may
include prerequesites of the acp binary. Allow specifying
LOCAL_ACP_UNAVAILABLE:=true on prebuilts.
Change-Id: Iccfe61092f90b61f397a45f5334b0c1c0f439b32
Ying Wang [Tue, 17 Nov 2015 01:16:47 +0000 (17:16 -0800)]
Remove unnecessary inheritance layer between aliases.
The extra inheritance layer may cause multiple
PRODUCT_DEVICE/PRODUCT_BRAND values for a product if it doesn't
explicitly override them, eg. gms.
The full_* are deprecated product names. We keep them just for backward
compatibility, for some tools may still use the full_* product names.
Bug:
25611987
Change-Id: I7ecebd422754c3ceb16507b8d9ced65d533fe7c3
Tao Bao [Tue, 17 Nov 2015 00:32:27 +0000 (16:32 -0800)]
releasetools: Pack updatable images into IMAGES/ for A/B update.
Vendor-specific images (radio, bootloader and etc) used to stay in
RADIO/ in target_files zip. A/B updater expects them to be available
under IMAGES/. Make a copy for such images when calling
add_img_to_target_files.py.
We cannot move them directly from RADIO/ to IMAGES/, because we will
delete everything under IMAGES/ when signing for release.
Bug:
25674625
Change-Id: I977c879d0ff7e45c83b3f5c63844a5b135caa383
Dan Albert [Mon, 16 Nov 2015 18:33:08 +0000 (18:33 +0000)]
Merge "Allow overriding the LLVM prebuilts path."
am:
9119f14943
* commit '
9119f14943b3d90863660fec58b4967c9ba2ccaa':
Allow overriding the LLVM prebuilts path.
Dan Albert [Mon, 16 Nov 2015 18:28:24 +0000 (18:28 +0000)]
Merge "Allow overriding the LLVM prebuilts path."
Dan Albert [Sat, 14 Nov 2015 07:06:07 +0000 (23:06 -0800)]
Allow overriding the LLVM prebuilts path.
The automated build will need to do a two stage build, and we want to
do that without altering the source directory. Building with
`make LLVM_PREBUILTS_BASE=/path/to/prebuilts` will build using an
arbitrary toolchain instead of the installed one.
Bug: http://b/
17441393
Change-Id: I4ff5c5224fbb8ebeb3a752907d6c4cd0a925aa1e
Sen Jiang [Fri, 13 Nov 2015 19:17:06 +0000 (19:17 +0000)]
Merge "Write AB_OTA_POSTINSTALL_CONFIG to META/postinstall_config.txt."
am:
99d5f361b4
* commit '
99d5f361b4d587eed1b197f501bff64223dda3b9':
Write AB_OTA_POSTINSTALL_CONFIG to META/postinstall_config.txt.
Sen Jiang [Fri, 13 Nov 2015 19:14:00 +0000 (19:14 +0000)]
Merge "Write AB_OTA_POSTINSTALL_CONFIG to META/postinstall_config.txt."
Sen Jiang [Thu, 12 Nov 2015 21:53:25 +0000 (13:53 -0800)]
Write AB_OTA_POSTINSTALL_CONFIG to META/postinstall_config.txt.
The config file will be passed to delta_generator to add the postinstall
field in the update payload.
Bug:
24537566
Change-Id: I06b8d9d0b2c37f9a3e7a844ac4d9e2eead8cd4d2
TEST: make dist
Shinichiro Hamaji [Fri, 13 Nov 2015 07:30:53 +0000 (07:30 +0000)]
Merge "Use GOMA_HERMETIC=error for USE_GOMA=true build"
am:
a50961ae95
* commit '
a50961ae9517cdaab83294e537f35922717e17f9':
Use GOMA_HERMETIC=error for USE_GOMA=true build
Shinichiro Hamaji [Fri, 13 Nov 2015 07:26:39 +0000 (07:26 +0000)]
Merge "Use GOMA_HERMETIC=error for USE_GOMA=true build"
Shinichiro Hamaji [Fri, 13 Nov 2015 06:02:46 +0000 (15:02 +0900)]
Use GOMA_HERMETIC=error for USE_GOMA=true build
With this flag, goma's client (gomacc) fails when local
compiler is different from goma's. Without this, goma's
backend finds a fallback compiler which looks closer to the
local compiler using version info, etc.
Bug:
25668061
Change-Id: I64ff81751f3fe960a557ddb2ca30a090c26c4327
Elliott Hughes [Fri, 13 Nov 2015 03:11:39 +0000 (03:11 +0000)]
Merge "Set WINVER as well as _WIN32_WINNT."
am:
4b6bb08da3
* commit '
4b6bb08da308004898ad7db177834f78c808eabb':
Set WINVER as well as _WIN32_WINNT.
Elliott Hughes [Fri, 13 Nov 2015 03:09:25 +0000 (03:09 +0000)]
Merge "Set WINVER as well as _WIN32_WINNT."
Dan Willemsen [Fri, 13 Nov 2015 01:44:44 +0000 (01:44 +0000)]
Merge "Sort dex and static lib resources"
am:
67d993fc9c
* commit '
67d993fc9cd01950f8994b7613362ea749be561a':
Sort dex and static lib resources
Dan Willemsen [Fri, 13 Nov 2015 01:39:30 +0000 (01:39 +0000)]
Merge "Sort dex and static lib resources"
Dan Albert [Fri, 13 Nov 2015 01:18:32 +0000 (01:18 +0000)]
Merge "Make not having Jack non-fatal."
am:
5f88dd0dd6
* commit '
5f88dd0dd68356679ebdc5991c20bbbad657cc43':
Make not having Jack non-fatal.
Dan Albert [Fri, 13 Nov 2015 01:18:24 +0000 (01:18 +0000)]
Merge "Allow globally disabling the relocation packer."
am:
6d6ba8aaf1
* commit '
6d6ba8aaf19b3f5cb209c0b60c7bfd1900411945':
Allow globally disabling the relocation packer.
Dan Albert [Fri, 13 Nov 2015 01:16:08 +0000 (01:16 +0000)]
Merge "Make not having Jack non-fatal."
Dan Albert [Fri, 13 Nov 2015 01:15:55 +0000 (01:15 +0000)]
Merge "Allow globally disabling the relocation packer."
Dan Albert [Thu, 12 Nov 2015 23:29:12 +0000 (15:29 -0800)]
Make not having Jack non-fatal.
Not every build needs Java.
Bug: http://b/
17441393
Change-Id: Ia55742cfd43c3a4f9c7873b87816bcce99f8156f
Dan Albert [Thu, 12 Nov 2015 23:27:49 +0000 (15:27 -0800)]
Allow globally disabling the relocation packer.
The relocation packer is part of prebuilts/misc, and pulling that
repository into the manifest requires pulling in a lot of other things
not needed by the simpler builds (like the clang toolchain manifest).
Bug: http://b/
17441393
Change-Id: If4a94804fc1a3f81215b840247f8e332d0b510c1
Elliott Hughes [Thu, 12 Nov 2015 21:33:20 +0000 (13:33 -0800)]
Set WINVER as well as _WIN32_WINNT.
Change-Id: I6ace26d6c25549cf42755423340af07e96e05779
Tao Bao [Thu, 12 Nov 2015 16:46:13 +0000 (16:46 +0000)]
Merge "build: Remove check_prereq."
am:
79dd4b2983
* commit '
79dd4b29831b5fe5b6d9627c0b0373374c4e3036':
build: Remove check_prereq.
Tao Bao [Thu, 12 Nov 2015 16:41:45 +0000 (16:41 +0000)]
Merge "build: Remove check_prereq."
Yohann Roussel [Thu, 12 Nov 2015 11:21:42 +0000 (12:21 +0100)]
Sort dex and static lib resources
Before adding them to the apk or javalib.jar. This allows the entries
order to be reproducible and will help to have a reproducible build.
Bug:
25629246
Change-Id: Ie596aecfdd08047ea9f9071896a2b980e7200b41
Tao Bao [Thu, 12 Nov 2015 05:26:29 +0000 (21:26 -0800)]
build: Remove check_prereq.
check_prereq is a tool for recovery API v2, which has been obselete
since we moved to v3 in [1].
[1] commit
e08991e02a7d678f2574e85289a34b2a9a537c82
Bug:
24621915
Change-Id: Ie96348fb56c5a3e029cac2417b59d8eb62dc085b
Dan Willemsen [Thu, 12 Nov 2015 05:25:24 +0000 (05:25 +0000)]
Merge "Make uncompressing jni libs in prebuilt APKs reproducible"
am:
ae8e6c8cda
* commit '
ae8e6c8cda704277ab84851c475ecd8bf4c484cb':
Make uncompressing jni libs in prebuilt APKs reproducible
Dan Willemsen [Thu, 12 Nov 2015 05:23:05 +0000 (05:23 +0000)]
Merge "Make uncompressing jni libs in prebuilt APKs reproducible"
Dan Willemsen [Thu, 12 Nov 2015 05:20:03 +0000 (05:20 +0000)]
Merge "Add tool to diff two target files packages"
am:
5685af316e
* commit '
5685af316e5e3f9601c8c56a68cad9b833153268':
Add tool to diff two target files packages
Dan Willemsen [Thu, 12 Nov 2015 05:16:29 +0000 (05:16 +0000)]
Merge "Add tool to diff two target files packages"
Dan Willemsen [Thu, 12 Nov 2015 02:20:37 +0000 (18:20 -0800)]
Make uncompressing jni libs in prebuilt APKs reproducible
This was extracting the shared libraries into a temporary directory,
then adding them back into the zip file using the raw filesystem
ordering. Fix that by passing a sorted list to zip.
Bug:
24201956
Change-Id: I59c41151968be6faf289e04719a9992157eb405d
Chih-hung Hsieh [Thu, 12 Nov 2015 01:09:32 +0000 (01:09 +0000)]
Merge "Revert "Enable gold linker for aarch64.""
am:
98c27a83da
* commit '
98c27a83da8caee0ed4e57c596d4f51e182588ef':
Revert "Enable gold linker for aarch64."
Chih-hung Hsieh [Thu, 12 Nov 2015 01:04:06 +0000 (01:04 +0000)]
Merge "Revert "Enable gold linker for aarch64.""
Chih-hung Hsieh [Wed, 11 Nov 2015 23:07:01 +0000 (23:07 +0000)]
Revert "Enable gold linker for aarch64."
This reverts commit
a7f68ee9eaa3dcaf4e17bbf6eb4dae68df2cbdda.
Change-Id: I8c15df8ce81859f1b950dbac0a47d7d24c0f4cc2
BUG:
25642296
Ying Wang [Wed, 11 Nov 2015 22:12:24 +0000 (22:12 +0000)]
Merge "Add suffix .so to use directly libart.so"
am:
d1fd823f33
* commit '
d1fd823f3349c55ba1d7e3b022a6bbff9f1f2680':
Add suffix .so to use directly libart.so
Ying Wang [Wed, 11 Nov 2015 22:05:48 +0000 (22:05 +0000)]
Merge "Add suffix .so to use directly libart.so"
Tao Bao [Wed, 11 Nov 2015 21:58:52 +0000 (21:58 +0000)]
Merge "releasetools: Support generating verify packages."
am:
6af8ef528b
* commit '
6af8ef528b97614bbb6cd6733ae5a8bc2fb8fbda':
releasetools: Support generating verify packages.
Tao Bao [Wed, 11 Nov 2015 21:53:11 +0000 (21:53 +0000)]
Merge "releasetools: Support generating verify packages."
Marie Janssen [Wed, 11 Nov 2015 20:05:50 +0000 (20:05 +0000)]
Merge "envsetup: fix for provision to work on zsh"
am:
4eb44e7a41
* commit '
4eb44e7a41666f019cba812943e7e13987bc20cc':
envsetup: fix for provision to work on zsh
Marie Janssen [Wed, 11 Nov 2015 20:01:13 +0000 (20:01 +0000)]
Merge "envsetup: fix for provision to work on zsh"
Tao Bao [Wed, 11 Nov 2015 19:45:41 +0000 (19:45 +0000)]
Merge "releasetools: Refactor ota_from_target_files.py."
am:
c1c01c6504
* commit '
c1c01c65042a84f9d12a1683451433ebaa111545':
releasetools: Refactor ota_from_target_files.py.
Tao Bao [Wed, 11 Nov 2015 19:38:44 +0000 (19:38 +0000)]
Merge "releasetools: Refactor ota_from_target_files.py."
Dan Willemsen [Tue, 10 Nov 2015 21:46:09 +0000 (21:46 +0000)]
Merge "Create reproducible NOTICE collections"
am:
92d746d158
* commit '
92d746d1580054722e0bdab9283f515a69e9c1ec':
Create reproducible NOTICE collections
Dan Willemsen [Tue, 10 Nov 2015 21:42:55 +0000 (21:42 +0000)]
Merge "Create reproducible NOTICE collections"
Tao Bao [Tue, 10 Nov 2015 00:58:28 +0000 (16:58 -0800)]
releasetools: Support generating verify packages.
We can generate a special OTA package that verifies all the partitions
(boot, recovery, system, vendor and etc) on a device. It also calls
device-specific script to verify bootloader and radio images. This
ensures a flashed device contains all the desired images faithfully.
Usage:
ota_from_target_files.py --gen_verify target_files.zip output.zip
Bug:
24679956
Change-Id: Ib3091d98c4b17a6fad305b3edf16d09efbda5c38
Dan Willemsen [Tue, 10 Nov 2015 20:37:23 +0000 (12:37 -0800)]
Create reproducible NOTICE collections
Sort the lists of notice files instead of relying on the filesystem
ordering returned by os.walk
Bug:
23972440
Change-Id: Id32be9ce8e540244ad9d67b6fc7883fc2963fe5c
Tao Bao [Tue, 10 Nov 2015 20:19:19 +0000 (12:19 -0800)]
releasetools: Refactor ota_from_target_files.py.
Factor out some common lines between generating incremental and full
OTAs. Remove the outer while loop for cleaner logic.
Change-Id: I0a4d44a4a59b488748222c2031bd63f67d45e0b5
Marie Janssen [Tue, 10 Nov 2015 18:41:15 +0000 (10:41 -0800)]
envsetup: fix for provision to work on zsh
The -p option means something else on zsh and breaks this function.
Bug: None
Change-Id: Ie0ba8119e34c616f5b8f931806063d6b1d3d893e
randy.jeong [Tue, 10 Nov 2015 07:42:49 +0000 (16:42 +0900)]
Add suffix .so to use directly libart.so
It should be the complete name with suffix .so to use libart.
At present, unnecessarily falls back like below.
"Falling back from libart to libart.so after dlopen error:
dlopen failed: library "libart" not found"
Change-Id: Ie5da35a71d6661434d2097c842407e6a254f8f58
Signed-off-by: randy.jeong <randy.jeong@samsung.com>
Stephen Hines [Tue, 10 Nov 2015 06:01:47 +0000 (06:01 +0000)]
Merge "Switch from clang 3.6 to new clang repository (with 3.8)."
am:
106eb619e2
* commit '
106eb619e242ef6694f66a862c1e21249de68f97':
Switch from clang 3.6 to new clang repository (with 3.8).
Stephen Hines [Tue, 10 Nov 2015 05:59:40 +0000 (05:59 +0000)]
Merge "Switch from clang 3.6 to new clang repository (with 3.8)."
Stephen Hines [Tue, 10 Nov 2015 00:32:11 +0000 (16:32 -0800)]
Switch from clang 3.6 to new clang repository (with 3.8).
This reverts commit
f7dbab16ffe97f41f8f8161b64d015830ab075ae.
Bug:
23396112
Switch from "-fsanitize-undefined-trap-on-error" to
"-fsanitize-trap=all". The former ends up accidentally leaving
unresolved calls to __ubsan* helper functions in the object file with
clang 3.8. The latter is used when we don't include address sanitizer,
and replaces any misbehavior with a direct call to abort().
Lee Campbell [Mon, 9 Nov 2015 20:47:25 +0000 (20:47 +0000)]
Merge "build: Add LINUX_KERNEL_COPYING license file"
am:
8b2c37c953
* commit '
8b2c37c9533f94f81fd8b15257c56061ce10998c':
build: Add LINUX_KERNEL_COPYING license file
Lee Campbell [Mon, 9 Nov 2015 20:41:08 +0000 (20:41 +0000)]
Merge "build: Add LINUX_KERNEL_COPYING license file"
Lee Campbell [Mon, 9 Nov 2015 00:28:15 +0000 (16:28 -0800)]
build: Add LINUX_KERNEL_COPYING license file
The build requires LINUX_KERNEL_COPYING when building
the notices. Change from depending on a file in
prebuilds/qemu-kernel to one in /build/core.
This is required as Brillo does not have the qemu-kernel
in its checkout.
BUG=
25578534
Change-Id: Ieff6970035d27884c0769106e507284c1096c33f
Griff Hazen [Sun, 8 Nov 2015 01:00:57 +0000 (01:00 +0000)]
Merge "Let qemu_props service set system properties in ro.emu and ro.emulator"
am:
0b4529239f
* commit '
0b4529239f42a828b7549dc00f1dcec8bbe196b2':
Let qemu_props service set system properties in ro.emu and ro.emulator
Griff Hazen [Sun, 8 Nov 2015 00:59:09 +0000 (00:59 +0000)]
Merge "Let qemu_props service set system properties in ro.emu and ro.emulator"
Griff Hazen [Sun, 8 Nov 2015 00:44:44 +0000 (16:44 -0800)]
Let qemu_props service set system properties in ro.emu and ro.emulator
These boot properties are used by android wear emulator to configure
round and chin shaped devices.
Bug:
23324757
Change-Id: I812da02d771bba0ffc63b14459c7de7cbdeed142
Dan Willemsen [Sat, 7 Nov 2015 02:36:16 +0000 (18:36 -0800)]
Add tool to diff two target files packages
This tool will help identify unexpected differences between two target
files packages. Expected changes (build number / date) are hidden, along
with known bugs.
It ignores anything that is just packaging for other files that are
already being diffed, like the recovery patching, and all of IMAGES/*
Bug
25372309
Change-Id: I4641754dd5dfbdfd3a89d8fa5262b9a9595e8e9c
Ying Wang [Fri, 6 Nov 2015 19:31:00 +0000 (19:31 +0000)]
Merge "Tag "tests" alone doesn\'t prevent including emma.jar"
am:
a23a97e3bf
* commit '
a23a97e3bf77bdd7fa01cd1f681d758a943db63a':
Tag "tests" alone doesn't prevent including emma.jar
Ying Wang [Fri, 6 Nov 2015 19:27:52 +0000 (19:27 +0000)]
Merge "Tag "tests" alone doesn't prevent including emma.jar"
Ying Wang [Fri, 6 Nov 2015 19:22:28 +0000 (11:22 -0800)]
Tag "tests" alone doesn't prevent including emma.jar
Only if an app has LOCAL_INSTRUMENTATION_FOR, it can get the emma
classes from the target app and we don't need to instrument the test app
itself.
Change-Id: If0fba50ddae757254fc58ca104d729d61603fd78
Steve Fung [Fri, 6 Nov 2015 03:23:31 +0000 (03:23 +0000)]
Merge "Add the build type to META folder in target files.zip"
am:
53a6fd6498
* commit '
53a6fd649817e5d9909d9aaca0369c19840f8613':
Add the build type to META folder in target files.zip
Steve Fung [Fri, 6 Nov 2015 03:18:35 +0000 (03:18 +0000)]
Merge "Add the build type to META folder in target files.zip"
Steve Fung [Thu, 5 Nov 2015 10:04:04 +0000 (02:04 -0800)]
Add the build type to META folder in target files.zip
For AB builds, add the build type to META/build_type.txt so the
server can easily determine user, userdebug, and eng builds
from each other.
Bug:
25420005
Change-Id: I6e4de2ba36a6fd1208c65a434d4725bb93d2cee6
Dan Willemsen [Thu, 5 Nov 2015 20:32:46 +0000 (20:32 +0000)]
Merge "Use explicitly sized types in zipalign/ziptime"
am:
1b2685137e
* commit '
1b2685137ee9cde6ea24ff37b54c5d8e1ee18b01':
Use explicitly sized types in zipalign/ziptime