OSDN Git Service
Bart Sears [Mon, 16 Nov 2015 07:36:53 +0000 (07:36 +0000)]
Change version back to 6.0 am:
970f203b3d am:
3a37a0cefd
am:
e373f066fb -s ours
* commit '
e373f066fbc4b96fd836d3a6e08e582ece8a0a2d':
Change version back to 6.0
Bart Sears [Sun, 15 Nov 2015 18:02:26 +0000 (18:02 +0000)]
Change version back to 6.0 am:
970f203b3d
am:
3a37a0cefd
* commit '
3a37a0cefd7599fa769fd86f7d64d781aaa88be7':
Change version back to 6.0
Bart Sears [Sun, 15 Nov 2015 17:59:32 +0000 (17:59 +0000)]
Change version back to 6.0
am:
970f203b3d
* commit '
970f203b3d3f17b778749c3ce47eb6b922aa606c':
Change version back to 6.0
Bart Sears [Sun, 15 Nov 2015 07:50:18 +0000 (23:50 -0800)]
Change version back to 6.0
Temporarily set the version back to 6.0 and security patch to
2015-11-01.
Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
Sen Jiang [Fri, 13 Nov 2015 19:23:41 +0000 (19:23 +0000)]
Merge "Write AB_OTA_POSTINSTALL_CONFIG to META/postinstall_config.txt." am:
99d5f361b4 am:
48ea511512
am:
0cac39037d
* commit '
0cac39037d68e6efc9caa2745d1ff41e22c8f6a3':
Write AB_OTA_POSTINSTALL_CONFIG to META/postinstall_config.txt.
Sen Jiang [Fri, 13 Nov 2015 19:20:12 +0000 (19:20 +0000)]
Merge "Write AB_OTA_POSTINSTALL_CONFIG to META/postinstall_config.txt." am:
99d5f361b4
am:
48ea511512
* commit '
48ea5115124a214b17af19ca4a5e6b720b46caa6':
Write AB_OTA_POSTINSTALL_CONFIG to META/postinstall_config.txt.
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:36:13 +0000 (07:36 +0000)]
Merge "Use GOMA_HERMETIC=error for USE_GOMA=true build" am:
a50961ae95 am:
13248f9343
am:
dd643975ba
* commit '
dd643975baade1ad52903cad546db39b0ec87c69':
Use GOMA_HERMETIC=error for USE_GOMA=true build
Shinichiro Hamaji [Fri, 13 Nov 2015 07:33:28 +0000 (07:33 +0000)]
Merge "Use GOMA_HERMETIC=error for USE_GOMA=true build" am:
a50961ae95
am:
13248f9343
* commit '
13248f9343f86c12269a0a43663a7cf8bdc77474':
Use GOMA_HERMETIC=error for USE_GOMA=true build
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:17:36 +0000 (03:17 +0000)]
Merge "Set WINVER as well as _WIN32_WINNT." am:
4b6bb08da3 am:
8b0e2e5094
am:
0301a78b8f
* commit '
0301a78b8f4843deb0cccbaf523d1586b1e2893b':
Set WINVER as well as _WIN32_WINNT.
Elliott Hughes [Fri, 13 Nov 2015 03:14:54 +0000 (03:14 +0000)]
Merge "Set WINVER as well as _WIN32_WINNT." am:
4b6bb08da3
am:
8b0e2e5094
* commit '
8b0e2e50949a0405af32176737f83bb4e561c8c2':
Set WINVER as well as _WIN32_WINNT.
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:51:48 +0000 (01:51 +0000)]
Merge "Sort dex and static lib resources" am:
67d993fc9c am:
aa725f6769
am:
786dc6400b
* commit '
786dc6400bf97dcbefab70df0b888379008a5419':
Sort dex and static lib resources
Dan Willemsen [Fri, 13 Nov 2015 01:48:54 +0000 (01:48 +0000)]
Merge "Sort dex and static lib resources" am:
67d993fc9c
am:
aa725f6769
* commit '
aa725f6769d546e1cfeab59ca0dff15736fbc152':
Sort dex and static lib resources
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:24:33 +0000 (01:24 +0000)]
Merge "Make not having Jack non-fatal." am:
5f88dd0dd6 am:
37a9e5d568
am:
934f9fec3d
* commit '
934f9fec3d72757f4a17c0abab0daea0ef9d4cdf':
Make not having Jack non-fatal.
Dan Albert [Fri, 13 Nov 2015 01:24:24 +0000 (01:24 +0000)]
Merge "Allow globally disabling the relocation packer." am:
6d6ba8aaf1 am:
18ace0f2fe
am:
d45361aa9e
* commit '
d45361aa9e420d5339bb087df779e14c6c4f94b9':
Allow globally disabling the relocation packer.
Dan Albert [Fri, 13 Nov 2015 01:21:51 +0000 (01:21 +0000)]
Merge "Make not having Jack non-fatal." am:
5f88dd0dd6
am:
37a9e5d568
* commit '
37a9e5d568c2e7b7ab2863ec937a758039b2745d':
Make not having Jack non-fatal.
Dan Albert [Fri, 13 Nov 2015 01:21:43 +0000 (01:21 +0000)]
Merge "Allow globally disabling the relocation packer." am:
6d6ba8aaf1
am:
18ace0f2fe
* commit '
18ace0f2fe1df46aade8cd818b169623005d6054':
Allow globally disabling the relocation packer.
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
Tao Bao [Thu, 12 Nov 2015 23:04:44 +0000 (23:04 +0000)]
Merge "build: Remove check_prereq." am:
79dd4b2983 am:
741c16686e
am:
0fa52e0d15
* commit '
0fa52e0d1598290bd83b4a7a6536848e20628db2':
build: Remove check_prereq.
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:50:32 +0000 (16:50 +0000)]
Merge "build: Remove check_prereq." am:
79dd4b2983
am:
741c16686e
* commit '
741c16686ebc9ac4d326a3942b437df9e7241e06':
build: Remove check_prereq.
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
Dan Willemsen [Thu, 12 Nov 2015 05:30:42 +0000 (05:30 +0000)]
Merge "Make uncompressing jni libs in prebuilt APKs reproducible" am:
ae8e6c8cda am:
0cfcb599ea
am:
bb7261222b
* commit '
bb7261222bcae9ffec19bcbdcdca0edb7e94fe95':
Make uncompressing jni libs in prebuilt APKs reproducible
Dan Willemsen [Thu, 12 Nov 2015 05:28:05 +0000 (05:28 +0000)]
Merge "Make uncompressing jni libs in prebuilt APKs reproducible" am:
ae8e6c8cda
am:
0cfcb599ea
* commit '
0cfcb599ea9047246767378b927413763960ef5e':
Make uncompressing jni libs in prebuilt APKs reproducible
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:25 +0000 (05:25 +0000)]
Merge "Add tool to diff two target files packages" am:
5685af316e am:
44c9fc0c28
am:
0aa34ca7a1
* commit '
0aa34ca7a11fac5660a8f78ec1f709b8c05e19f1':
Add tool to diff two target files packages
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:22:38 +0000 (05:22 +0000)]
Merge "Add tool to diff two target files packages" am:
5685af316e
am:
44c9fc0c28
* commit '
44c9fc0c28d399084ff4ccf3e59a71341240a602':
Add tool to diff two target files packages
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:17:33 +0000 (01:17 +0000)]
Merge "Revert "Enable gold linker for aarch64."" am:
98c27a83da am:
5188f77e8f
am:
68acf5e4fe
* commit '
68acf5e4fe4e03833e00ea151afde6460c71c765':
Revert "Enable gold linker for aarch64."
Chih-hung Hsieh [Thu, 12 Nov 2015 01:13:23 +0000 (01:13 +0000)]
Merge "Revert "Enable gold linker for aarch64."" am:
98c27a83da
am:
5188f77e8f
* commit '
5188f77e8f6729ba7ecfe501c94f90d18828987a':
Revert "Enable gold linker for aarch64."
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:19:42 +0000 (22:19 +0000)]
Merge "Add suffix .so to use directly libart.so" am:
d1fd823f33 am:
d54b9e6ba0
am:
d06577781c
* commit '
d06577781c169c5292c79c71485764ad3f19547d':
Add suffix .so to use directly libart.so
Ying Wang [Wed, 11 Nov 2015 22:15:06 +0000 (22:15 +0000)]
Merge "Add suffix .so to use directly libart.so" am:
d1fd823f33
am:
d54b9e6ba0
* commit '
d54b9e6ba09e7c3f45df39e4f9f13628e4233de8':
Add suffix .so to use directly libart.so
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
Tao Bao [Wed, 11 Nov 2015 22:07:09 +0000 (22:07 +0000)]
Merge "releasetools: Support generating verify packages." am:
6af8ef528b am:
58dcdc41c0
am:
c4d4018f10
* commit '
c4d4018f10efc0a5dc82f4f5f2be44482557cb42':
releasetools: Support generating verify packages.
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 22:03:54 +0000 (22:03 +0000)]
Merge "releasetools: Support generating verify packages." am:
6af8ef528b
am:
58dcdc41c0
* commit '
58dcdc41c02260ad8686c9744efbe064a1bfb77f':
releasetools: Support generating verify packages.
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."
Ian Pedowitz [Wed, 11 Nov 2015 21:18:43 +0000 (21:18 +0000)]
Merge "Change PLATFORM_VERSION from NYC to N"
Marie Janssen [Wed, 11 Nov 2015 20:15:23 +0000 (20:15 +0000)]
Merge "envsetup: fix for provision to work on zsh" am:
4eb44e7a41 am:
02156d1469
am:
8e56bd33b2
* commit '
8e56bd33b2a6ce55a17a17bcd09ddaa8da541425':
envsetup: fix for provision to work on zsh
Marie Janssen [Wed, 11 Nov 2015 20:10:59 +0000 (20:10 +0000)]
Merge "envsetup: fix for provision to work on zsh" am:
4eb44e7a41
am:
02156d1469
* commit '
02156d14691f4436effc63b828f9a2b7906ab3ef':
envsetup: fix for provision to work on zsh
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:55:10 +0000 (19:55 +0000)]
Merge "releasetools: Refactor ota_from_target_files.py." am:
c1c01c6504 am:
a95168b221
am:
391c7666e1
* commit '
391c7666e1a1414bb546e0d0e97540bd316aa368':
releasetools: Refactor ota_from_target_files.py.
Tao Bao [Wed, 11 Nov 2015 19:51:22 +0000 (19:51 +0000)]
Merge "releasetools: Refactor ota_from_target_files.py." am:
c1c01c6504
am:
a95168b221
* commit '
a95168b221ac1f58d05dd2997c5d39e9d064ceb5':
releasetools: Refactor ota_from_target_files.py.
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.
Vince Harron [Wed, 11 Nov 2015 19:45:41 +0000 (19:45 +0000)]
Switch emulator to generate userdebug images by default am:
ba740ff57f am:
796f000346
am:
6d8399ee83
* commit '
6d8399ee8351e403da49ccbbf3c3546dde0e52d6':
Switch emulator to generate userdebug images by default
Vince Harron [Wed, 11 Nov 2015 19:40:45 +0000 (19:40 +0000)]
Switch emulator to generate userdebug images by default am:
ba740ff57f
am:
796f000346
* commit '
796f0003464da70f42346a0240fe8d4142706ff1':
Switch emulator to generate userdebug images by default
Tao Bao [Wed, 11 Nov 2015 19:38:44 +0000 (19:38 +0000)]
Merge "releasetools: Refactor ota_from_target_files.py."
Vince Harron [Wed, 11 Nov 2015 19:37:38 +0000 (19:37 +0000)]
Switch emulator to generate userdebug images by default
am:
ba740ff57f
* commit '
ba740ff57fd314d0ad649c252841ab834e96fdaa':
Switch emulator to generate userdebug images by default
Ian Pedowitz [Tue, 10 Nov 2015 15:28:53 +0000 (07:28 -0800)]
Change PLATFORM_VERSION from NYC to N
But won't someone think of the cheesecake?
Bug:
25558821
Change-Id: Icf0adcb5b429a517fdbddb0d137d396a2d168c7c
Vince Harron [Tue, 27 Oct 2015 23:08:25 +0000 (16:08 -0700)]
Switch emulator to generate userdebug images by default
This is primarily to avoid using the unsupported JIT on Android-M
It will increase app install times significantly because the app will
be compiled at install time. OTOH, It should improve application
performance dramatically.
Change-Id: Id1d637ec561db177fd52e4c111f4def2a1b45543
(cherry picked from commit
08787d747d71d7ff3f13d2275d937faefc6d7777)
Nicolas Geoffray [Wed, 11 Nov 2015 08:47:36 +0000 (08:47 +0000)]
Merge "Make jit the default for all builds."
Dan Willemsen [Tue, 10 Nov 2015 21:50:36 +0000 (21:50 +0000)]
Merge "Create reproducible NOTICE collections" am:
92d746d158 am:
eb861a7bc1
am:
bcdc6f10a0
* commit '
bcdc6f10a03b9c22d3fbe23632703801fafc8b00':
Create reproducible NOTICE collections
Dan Willemsen [Tue, 10 Nov 2015 21:48:11 +0000 (21:48 +0000)]
Merge "Create reproducible NOTICE collections" am:
92d746d158
am:
eb861a7bc1
* commit '
eb861a7bc1df3b53ce1e826fadf45972eeb18597':
Create reproducible NOTICE collections
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:06:34 +0000 (06:06 +0000)]
Merge "Switch from clang 3.6 to new clang repository (with 3.8)." am:
106eb619e2 am:
3f83ed0181
am:
ea4e438158
* commit '
ea4e438158b35f897c4a24caced15a65e4ca7308':
Switch from clang 3.6 to new clang repository (with 3.8).
Stephen Hines [Tue, 10 Nov 2015 06:03:55 +0000 (06:03 +0000)]
Merge "Switch from clang 3.6 to new clang repository (with 3.8)." am:
106eb619e2
am:
3f83ed0181
* commit '
3f83ed0181c5ac1966c195b0fdc0ea88a9ee2deb':
Switch from clang 3.6 to new clang repository (with 3.8).
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:53:44 +0000 (20:53 +0000)]
Merge "build: Add LINUX_KERNEL_COPYING license file" am:
8b2c37c953 am:
5bd31df419
am:
b1c8a7ee94
* commit '
b1c8a7ee9454ca6c43a6d3257563b13b710d86e5':
build: Add LINUX_KERNEL_COPYING license file
Lee Campbell [Mon, 9 Nov 2015 20:50:27 +0000 (20:50 +0000)]
Merge "build: Add LINUX_KERNEL_COPYING license file" am:
8b2c37c953
am:
5bd31df419
* commit '
5bd31df419703087fd05bc4e3ecf146d9a0fe141':
build: Add LINUX_KERNEL_COPYING license file
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 18:15:58 +0000 (18:15 +0000)]
Let qemu_props service set system properties in ro.emu and ro.emulator am:
20ed978ada am:
3943e48c6e
am:
02023eff3b
* commit '
02023eff3bdd6ba0e35ca39f228084fa3ac1cbd6':
Let qemu_props service set system properties in ro.emu and ro.emulator
Griff Hazen [Sun, 8 Nov 2015 18:14:27 +0000 (18:14 +0000)]
Let qemu_props service set system properties in ro.emu and ro.emulator am:
20ed978ada
am:
3943e48c6e
* commit '
3943e48c6e4a51304e8b2c8ae86f0750bfe11190':
Let qemu_props service set system properties in ro.emu and ro.emulator
Griff Hazen [Sun, 8 Nov 2015 01:06:15 +0000 (01:06 +0000)]
Merge "Let qemu_props service set system properties in ro.emu and ro.emulator" am:
0b4529239f am:
2e4314481e
am:
9707c5d724
* commit '
9707c5d724d3b6db9cc54156ea099399c1b80f9d':
Let qemu_props service set system properties in ro.emu and ro.emulator
Griff Hazen [Sun, 8 Nov 2015 01:03:33 +0000 (01:03 +0000)]
Merge "Let qemu_props service set system properties in ro.emu and ro.emulator" am:
0b4529239f
am:
2e4314481e
* commit '
2e4314481e222662329fcae20e982399da35e44f':
Let qemu_props service set system properties in ro.emu and ro.emulator
Griff Hazen [Sun, 8 Nov 2015 01:00:58 +0000 (01:00 +0000)]
Let qemu_props service set system properties in ro.emu and ro.emulator
am:
20ed978ada
* commit '
20ed978ada07690b7ca6d643f6c8869e656ccff7':
Let qemu_props service set system properties in ro.emu and ro.emulator
OSDN Git Service
