OSDN Git Service
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.
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
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: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
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"
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
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
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
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
Ying Wang [Fri, 6 Nov 2015 19:36:43 +0000 (19:36 +0000)]
Merge "Tag "tests" alone doesn\'t prevent including emma.jar" am:
a23a97e3bf am:
7c09c937b6
am:
1704a32d40
* commit '
1704a32d40d181a659a25e2c69e51ef9b719f818':
Tag "tests" alone doesn't prevent including emma.jar
Ying Wang [Fri, 6 Nov 2015 19:32:48 +0000 (19:32 +0000)]
Merge "Tag "tests" alone doesn\'t prevent including emma.jar" am:
a23a97e3bf
am:
7c09c937b6
* commit '
7c09c937b6e5e747d31e5ba308e6b3939cfdd83e':
Tag "tests" alone doesn't prevent including emma.jar
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:28:04 +0000 (03:28 +0000)]
Merge "Add the build type to META folder in target files.zip" am:
53a6fd6498 am:
dc43cddbf6
am:
60bc4bf8fc
* commit '
60bc4bf8fc5828d1725d8bbf1ef35c4e1a8ccbdf':
Add the build type to META folder in target files.zip
Dan Willemsen [Fri, 6 Nov 2015 03:27:57 +0000 (03:27 +0000)]
Merge "Use explicitly sized types in zipalign/ziptime" am:
1b2685137e am:
163196aa48
am:
4ad4bd5817
* commit '
4ad4bd58173e9ab6ab98e2112ce44ee1c45438ae':
Use explicitly sized types in zipalign/ziptime
Steve Fung [Fri, 6 Nov 2015 03:25:42 +0000 (03:25 +0000)]
Merge "Add the build type to META folder in target files.zip" am:
53a6fd6498
am:
dc43cddbf6
* commit '
dc43cddbf613daeda98c02836d6ff82592fc53f7':
Add the build type to META folder in target files.zip
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:35:26 +0000 (20:35 +0000)]
Merge "Use explicitly sized types in zipalign/ziptime" am:
1b2685137e
am:
163196aa48
* commit '
163196aa481eb8d279822ff93027526ca2c189c1':
Use explicitly sized types in zipalign/ziptime
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
Dan Willemsen [Thu, 5 Nov 2015 20:28:20 +0000 (20:28 +0000)]
Merge "Use explicitly sized types in zipalign/ziptime"
Nicolas Geoffray [Thu, 5 Nov 2015 16:49:49 +0000 (16:49 +0000)]
Make jit the default for all builds.
Change-Id: Ifa4280cdab0747cae8d3e2becec47b230846def6
Than McIntosh [Thu, 5 Nov 2015 11:57:47 +0000 (11:57 +0000)]
Merge "Enable gold linker for aarch64." am:
838ad09b17 am:
fbf9234233
am:
4f75b8053f
* commit '
4f75b8053fee2067de736178ff22ac2d7d9af71f':
Enable gold linker for aarch64.
Than McIntosh [Thu, 5 Nov 2015 11:55:11 +0000 (11:55 +0000)]
Merge "Enable gold linker for aarch64." am:
838ad09b17
am:
fbf9234233
* commit '
fbf92342335ce2df25c0c61d58c22f62cffa5de1':
Enable gold linker for aarch64.
Than McIntosh [Thu, 5 Nov 2015 11:52:25 +0000 (11:52 +0000)]
Merge "Enable gold linker for aarch64."
am:
838ad09b17
* commit '
838ad09b17c6525122e6e8881674030e6746a8c4':
Enable gold linker for aarch64.
Than McIntosh [Thu, 5 Nov 2015 11:49:56 +0000 (11:49 +0000)]
Merge "Enable gold linker for aarch64."
Shinichiro Hamaji [Thu, 5 Nov 2015 04:11:52 +0000 (04:11 +0000)]
Merge "Allow missing SONAME in .toc files" am:
457345e58c am:
7070e5dc59
am:
ad397422b4
* commit '
ad397422b4da3f5faff4e2ca69d4596b97e4bd61':
Allow missing SONAME in .toc files
Shinichiro Hamaji [Thu, 5 Nov 2015 04:09:59 +0000 (04:09 +0000)]
Merge "Allow missing SONAME in .toc files" am:
457345e58c
am:
7070e5dc59
* commit '
7070e5dc596376803802dd91aa9b446ee0571e5a':
Allow missing SONAME in .toc files
Shinichiro Hamaji [Thu, 5 Nov 2015 04:07:21 +0000 (04:07 +0000)]
Merge "Allow missing SONAME in .toc files"
am:
457345e58c
* commit '
457345e58c9f273a467847e2086318d6d8380d5b':
Allow missing SONAME in .toc files
Shinichiro Hamaji [Thu, 5 Nov 2015 04:02:37 +0000 (04:02 +0000)]
Merge "Allow missing SONAME in .toc files"
Shinichiro Hamaji [Thu, 5 Nov 2015 03:51:08 +0000 (12:51 +0900)]
Allow missing SONAME in .toc files
At least one shared object in internal repo doesn't have
SONAME entry in its dynamic segment because it is created by
objcopy instead of a linker.
Change-Id: If7106da022ff1e4e925191402f9072795dc3ddcb
Shinichiro Hamaji [Thu, 5 Nov 2015 01:33:46 +0000 (01:33 +0000)]
Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries" am:
2f8ffa61be am:
7557ad2bbd
am:
506c43c871
* commit '
506c43c87193433533245150673f5d386aa10953':
Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries
Shinichiro Hamaji [Thu, 5 Nov 2015 01:30:34 +0000 (01:30 +0000)]
Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries" am:
2f8ffa61be
am:
7557ad2bbd
* commit '
7557ad2bbdcf365f96a5df810cbfcc43f1766dfd':
Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries
Shinichiro Hamaji [Thu, 5 Nov 2015 01:27:06 +0000 (01:27 +0000)]
Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries"
am:
2f8ffa61be
* commit '
2f8ffa61bee03593a89913806e863f73a8e646b7':
Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries
Shinichiro Hamaji [Thu, 5 Nov 2015 00:46:04 +0000 (00:46 +0000)]
Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries"
Than McIntosh [Thu, 5 Nov 2015 00:21:00 +0000 (19:21 -0500)]
Enable gold linker for aarch64.
[Second attempt, this time with updated mac prebuilt]
Switches default linker from -fuse-ld-bfd to
-fuse-ld=gold, and enables -Wl,--icf=safe. This
changes reduces /system/lib64/*.so text size
by about 2% for N9.
Change-Id: I587075aae9d70cb6b16e55dc9cd1052580ac2626
Dan Willemsen [Wed, 4 Nov 2015 22:08:20 +0000 (14:08 -0800)]
Use explicitly sized types in zipalign/ziptime
getLongLE would return a 64-bit number with the upper 32-bits set when
decoding a 32-bit number with the top bit set. Per the zip file format,
it was only expected to return a 32-bit number. Use explicitly sized
types so that we use the proper sizes and don't do any implicit
extensions.
Change-Id: I5a4304dc99ce5f8f17284d4ca3094ae115207a1e
Jeffrey Vander Stoep [Wed, 4 Nov 2015 19:06:04 +0000 (19:06 +0000)]
Merge "selinux: Grant all processes the domain_deprecated attribute" am:
b18da85cb6 am:
6e32d6b0a0
am:
10b3d6cfcb
* commit '
10b3d6cfcb357442eefc404c1c83580304f0033a':
selinux: Grant all processes the domain_deprecated attribute
Jeffrey Vander Stoep [Wed, 4 Nov 2015 19:02:11 +0000 (19:02 +0000)]
Merge "selinux: Grant all processes the domain_deprecated attribute" am:
b18da85cb6
am:
6e32d6b0a0
* commit '
6e32d6b0a01c0deb25196566a7f8c36c2db331e8':
selinux: Grant all processes the domain_deprecated attribute
Jeffrey Vander Stoep [Wed, 4 Nov 2015 18:57:14 +0000 (18:57 +0000)]
Merge "selinux: Grant all processes the domain_deprecated attribute"
am:
b18da85cb6
* commit '
b18da85cb6b19f156e476cf4fb5d97f4e90ce84a':
selinux: Grant all processes the domain_deprecated attribute
Jeffrey Vander Stoep [Wed, 4 Nov 2015 18:47:32 +0000 (18:47 +0000)]
Merge "selinux: Grant all processes the domain_deprecated attribute"
Ying Wang [Wed, 4 Nov 2015 18:45:19 +0000 (18:45 +0000)]
Merge "Don\'t run ziptime on host zip files." am:
7f50cf7f50 am:
3a5c02e295
am:
3932de119a
* commit '
3932de119a79ec3ddf5972722a9cb6fb8e4526b1':
Don't run ziptime on host zip files.
Ying Wang [Wed, 4 Nov 2015 18:25:01 +0000 (18:25 +0000)]
Merge "Don\'t run ziptime on host zip files." am:
7f50cf7f50
am:
3a5c02e295
* commit '
3a5c02e295972163ef3686dfbd981c4541b803d6':
Don't run ziptime on host zip files.
Ying Wang [Wed, 4 Nov 2015 18:19:54 +0000 (18:19 +0000)]
Merge "Don\'t run ziptime on host zip files."
am:
7f50cf7f50
* commit '
7f50cf7f501a7289cbe8c03eb20ed0f54edf5a99':
Don't run ziptime on host zip files.
Ying Wang [Wed, 4 Nov 2015 18:13:03 +0000 (18:13 +0000)]
Merge "Don't run ziptime on host zip files."
Ying Wang [Wed, 4 Nov 2015 18:06:25 +0000 (10:06 -0800)]
Don't run ziptime on host zip files.
ziptime fails on zip file larger than 2GB.
These zip files won't installed on device and we don't care that much
about their reprodudcibility across builds.
Change-Id: I47062928d075a59eda92dd5333e59502f490d1cb
Jeff Vander Stoep [Wed, 4 Nov 2015 16:49:07 +0000 (08:49 -0800)]
selinux: Grant all processes the domain_deprecated attribute
Bug:
25433265
Change-Id: Iafad5abd6e75c5a46f844ef3e744adf1c904b362
Shinichiro Hamaji [Fri, 9 Oct 2015 05:36:04 +0000 (14:36 +0900)]
Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries
When a shared object is rebuilt, all dependent libraries and
executables are rebuilt. Such rebuild is unnecessary when there
is no interface change. With this patch, .toc files will be
generated for all .so files. The rule which generates .toc files
has ninja's restat=1 and .toc files are not changed ninja won't
rebuild dependent targets.
Performance:
$ m && touch bionic/libc/stdio/stdio.c && time m
Before: 1m03s (2563 targets)
After: 21s (90 targets)
Bug:
24597504
Change-Id: Ia5dd950273d143f4e99eee8bef7478f1a94cd138
Ying Wang [Wed, 4 Nov 2015 01:23:49 +0000 (01:23 +0000)]
Merge "Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS." am:
5dd68067a6 am:
32078cd8b2
am:
29b2672b1e
* commit '
29b2672b1e0da4a5afb1a38caa1deaef65145e2e':
Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS.
Ying Wang [Wed, 4 Nov 2015 01:19:18 +0000 (01:19 +0000)]
Merge "Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS." am:
5dd68067a6
am:
32078cd8b2
* commit '
32078cd8b23732b7eb80a9b5dd74daa471e3ae5d':
Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS.
Ying Wang [Wed, 4 Nov 2015 01:15:47 +0000 (01:15 +0000)]
Merge "Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS."
am:
5dd68067a6
* commit '
5dd68067a6a5e48b29882ca065606ab85b20d3d7':
Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS.
Ying Wang [Wed, 4 Nov 2015 01:11:14 +0000 (01:11 +0000)]
Merge "Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS."
Ying Wang [Wed, 28 Oct 2015 19:34:03 +0000 (12:34 -0700)]
Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS.
ANDROID_GOALS: any Android goals that need to be built.
KATI_GOALS: goals that we need to pass to Kati.
NINJA_GOALS: goals we need to pass to Ninja.
For modifier Android goals (dist, INTERNAL_MODIFIER_TARGETS),
we don't need to pass them to Ninja. See also commit
80e46c7c5cb7b1d80114876d301798a8624b4200.
Restore the dist rule removed by the above commit.
Previously "droid" was never passed to Ninja. That's incorrect.
"make droid docs" should build both docs and droiod.
Fixed with this change.
Change-Id: I5c28061fe0ebe7848872ee349056d029b787ff71
Dan Willemsen [Wed, 4 Nov 2015 00:47:24 +0000 (00:47 +0000)]
Merge "Don\'t use ziptime with unbundled builds" am:
29a6675983 am:
3665246dcb
am:
8ccf645f94
* commit '
8ccf645f94c0b21c6407576df0ba0990d96167b1':
Don't use ziptime with unbundled builds
Dan Willemsen [Wed, 4 Nov 2015 00:43:37 +0000 (00:43 +0000)]
Merge "Don\'t use ziptime with unbundled builds" am:
29a6675983
am:
3665246dcb
* commit '
3665246dcb537d9f7a0196be967b54cf28a224f3':
Don't use ziptime with unbundled builds
Dan Willemsen [Wed, 4 Nov 2015 00:33:44 +0000 (00:33 +0000)]
Merge "Don\'t use ziptime with unbundled builds"
am:
29a6675983
* commit '
29a667598340624f38b0a08c3e9984afc375b12d':
Don't use ziptime with unbundled builds
Dan Willemsen [Wed, 4 Nov 2015 00:24:59 +0000 (00:24 +0000)]
Merge "Don't use ziptime with unbundled builds"
Dan Willemsen [Wed, 4 Nov 2015 00:09:49 +0000 (16:09 -0800)]
Don't use ziptime with unbundled builds
Some of the trees are unable to compile native code with the normal
build rules, even though they can build kati.
Bug:
24201956
Change-Id: I2afc3468480b2c78407d62323e6b82979c8ee254
Clay Murphy [Wed, 4 Nov 2015 00:07:07 +0000 (00:07 +0000)]
Merge "Docs: Add Security tab to top" am:
e47d8b99a2 am:
97b8e290b5
am:
50b167643f
* commit '
50b167643fbe6391696095219e3a6a6f3004647a':
Docs: Add Security tab to top
Clay Murphy [Wed, 4 Nov 2015 00:01:42 +0000 (00:01 +0000)]
Merge "Docs: Add Security tab to top" am:
e47d8b99a2
am:
97b8e290b5
* commit '
97b8e290b513cc3a2f9b41ccb85b80a9c4ae58d9':
Docs: Add Security tab to top
Clay Murphy [Tue, 3 Nov 2015 23:56:54 +0000 (23:56 +0000)]
Merge "Docs: Add Security tab to top"
am:
e47d8b99a2
* commit '
e47d8b99a2274b7689371685a819b5d1bf6e1cb1':
Docs: Add Security tab to top
Clay Murphy [Tue, 3 Nov 2015 23:45:56 +0000 (23:45 +0000)]
Merge "Docs: Add Security tab to top"
Bill Yi [Tue, 3 Nov 2015 23:45:16 +0000 (23:45 +0000)]
Dan Willemsen [Tue, 3 Nov 2015 23:43:30 +0000 (23:43 +0000)]
Merge "Remove changing uids/timestamps from zip/jar files" am:
a0975edc16
am:
c789be850c
* commit '
c789be850ca14b945e72412457991d7a5e13126e':
Remove changing uids/timestamps from zip/jar files
Bill Yi [Tue, 3 Nov 2015 23:31:35 +0000 (23:31 +0000)]
Bill Yi [Tue, 3 Nov 2015 22:28:58 +0000 (14:28 -0800)]
Dan Willemsen [Tue, 3 Nov 2015 21:47:30 +0000 (21:47 +0000)]
Merge "Remove changing uids/timestamps from zip/jar files"
am:
a0975edc16
* commit '
a0975edc164f4ff248882e660d95802eabd72fd4':
Remove changing uids/timestamps from zip/jar files
Dan Willemsen [Tue, 3 Nov 2015 21:38:45 +0000 (21:38 +0000)]
Merge "Remove changing uids/timestamps from zip/jar files"
Ying Wang [Tue, 3 Nov 2015 00:49:23 +0000 (00:49 +0000)]
Merge "Don\'t check the host JDK tools when build/core/config.mk is called from envsetup.sh." am:
a63d379aab am:
fb89fd36b2
am:
88f5d25be1
* commit '
88f5d25be1b0756db65b34114929b4dd0bc5f05c':
Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh.
Gaurav Shah [Tue, 3 Nov 2015 00:49:16 +0000 (00:49 +0000)]
Merge "envsetup,product,ninja: enable symlink traversal" am:
f589c7b442 am:
af80a461d6
am:
8b3e6b79ef
* commit '
8b3e6b79ef9bb235264e3b2297d103ea7b89f38e':
envsetup,product,ninja: enable symlink traversal
Gaurav Shah [Tue, 3 Nov 2015 00:49:10 +0000 (00:49 +0000)]
Merge "Support build targets with no installable apps/packages" am:
aed6805380 am:
00b8cd9a15
am:
4b566a1d8b
* commit '
4b566a1d8be4946cf0b756fe5a98af3ff57cb267':
Support build targets with no installable apps/packages
Gaurav Shah [Tue, 3 Nov 2015 00:49:03 +0000 (00:49 +0000)]
Merge "build: Add extra build customization for /product" am:
a80f1e3257 am:
64ea350dd8
am:
8e712959cf
* commit '
8e712959cf8a8b9b454d1e50f960eef9d97cfbc9':
build: Add extra build customization for /product
Gaurav Shah [Tue, 3 Nov 2015 00:48:56 +0000 (00:48 +0000)]
Merge "build: Add support for defining products in /product" am:
acb8a7c1f8 am:
881ec090c4
am:
555489aa84
* commit '
555489aa84954ff9de6e661169c5c0fe95f62c40':
build: Add support for defining products in /product