OSDN Git Service

android-x86/build.git
8 years agoMerge "Switch from clang 3.6 to new clang repository (with 3.8)." am: 106eb619e2...
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).

8 years agoMerge "Switch from clang 3.6 to new clang repository (with 3.8)." am: 106eb619e2
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).

8 years agoMerge "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).

8 years agoMerge "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)."

8 years agoSwitch 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().

8 years agoMerge "build: Add LINUX_KERNEL_COPYING license file" am: 8b2c37c953 am: 5bd31df419
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

8 years agoMerge "build: Add LINUX_KERNEL_COPYING license file" am: 8b2c37c953
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

8 years agoMerge "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

8 years agoMerge "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"

8 years agobuild: 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

8 years agoLet qemu_props service set system properties in ro.emu and ro.emulator am: 20ed978ada...
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

8 years agoLet qemu_props service set system properties in ro.emu and ro.emulator am: 20ed978ada
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

8 years agoMerge "Let qemu_props service set system properties in ro.emu and ro.emulator" am...
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

8 years agoMerge "Let qemu_props service set system properties in ro.emu and ro.emulator" am...
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

8 years agoLet 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

8 years agoMerge "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

8 years agoMerge "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"

8 years agoLet 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

8 years agoLet 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

8 years agoMerge "Tag "tests" alone doesn\'t prevent including emma.jar" am: a23a97e3bf am:...
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

8 years agoMerge "Tag "tests" alone doesn\'t prevent including emma.jar" am: a23a97e3bf
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

8 years agoMerge "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

8 years agoMerge "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"

8 years agoTag "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

8 years agoMerge "Add the build type to META folder in target files.zip" am: 53a6fd6498 am:...
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

8 years agoMerge "Use explicitly sized types in zipalign/ziptime" am: 1b2685137e am: 163196aa48
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

8 years agoMerge "Add the build type to META folder in target files.zip" am: 53a6fd6498
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

8 years agoMerge "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

8 years agoMerge "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"

8 years agoAdd 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

8 years agoMerge "Use explicitly sized types in zipalign/ziptime" am: 1b2685137e
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

8 years agoMerge "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

8 years agoMerge "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"

8 years agoMerge "Enable gold linker for aarch64." am: 838ad09b17 am: fbf9234233
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.

8 years agoMerge "Enable gold linker for aarch64." am: 838ad09b17
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.

8 years agoMerge "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.

8 years agoMerge "Enable gold linker for aarch64."
Than McIntosh [Thu, 5 Nov 2015 11:49:56 +0000 (11:49 +0000)]
Merge "Enable gold linker for aarch64."

8 years agoMerge "Allow missing SONAME in .toc files" am: 457345e58c am: 7070e5dc59
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

8 years agoMerge "Allow missing SONAME in .toc files" am: 457345e58c
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

8 years agoMerge "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

8 years agoMerge "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"

8 years agoAllow 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

8 years agoMerge "Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries" am: 2f8ffa61be...
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

8 years agoMerge "Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries" am: 2f8ffa61be
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

8 years agoMerge "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

8 years agoMerge "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"

8 years agoEnable gold linker for aarch64.
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

8 years agoUse explicitly sized types in zipalign/ziptime
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

8 years agoMerge "selinux: Grant all processes the domain_deprecated attribute" am: b18da85cb6...
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

8 years agoMerge "selinux: Grant all processes the domain_deprecated attribute" am: b18da85cb6
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

8 years agoMerge "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

8 years agoMerge "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"

8 years agoMerge "Don\'t run ziptime on host zip files." am: 7f50cf7f50 am: 3a5c02e295
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.

8 years agoMerge "Don\'t run ziptime on host zip files." am: 7f50cf7f50
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoDon'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

8 years agoselinux: Grant all processes the domain_deprecated attribute
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

8 years agoUse .KATI_RESTAT to reduce unnecessary rebuilds of binaries
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

8 years agoMerge "Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS." am: 5dd68067a6 am: 32078cd8b2
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.

8 years agoMerge "Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS." am: 5dd68067a6
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoSort 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

8 years agoMerge "Don\'t use ziptime with unbundled builds" am: 29a6675983 am: 3665246dcb
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

8 years agoMerge "Don\'t use ziptime with unbundled builds" am: 29a6675983
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

8 years agoMerge "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

8 years agoMerge "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"

8 years agoDon'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

8 years agoMerge "Docs: Add Security tab to top" am: e47d8b99a2 am: 97b8e290b5
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

8 years agoMerge "Docs: Add Security tab to top" am: e47d8b99a2
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

8 years agoMerge "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

8 years agoMerge "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"

8 years agoMerge commit \'4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582\' into HEAD am: af05ad919a
Bill Yi [Tue, 3 Nov 2015 23:45:16 +0000 (23:45 +0000)]
Merge commit \'4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582\' into HEAD am: af05ad919a
am: a87d67d311

* commit 'a87d67d31144f5cffe908338f48f8be094e8adbe':

8 years agoMerge "Remove changing uids/timestamps from zip/jar files" am: a0975edc16
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

8 years agoMerge commit \'4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582\' into HEAD
Bill Yi [Tue, 3 Nov 2015 23:31:35 +0000 (23:31 +0000)]
Merge commit \'4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582\' into HEAD
am: af05ad919a

* commit 'af05ad919aca901bbadabad5988ad77e8426e1e2':

8 years agoMerge commit '4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582' into HEAD
Bill Yi [Tue, 3 Nov 2015 22:28:58 +0000 (14:28 -0800)]
Merge commit '4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582' into HEAD

8 years agoMerge "Remove changing uids/timestamps from zip/jar files"
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

8 years agoMerge "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"

8 years agoMerge "Don\'t check the host JDK tools when build/core/config.mk is called from envse...
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.

8 years agoMerge "envsetup,product,ninja: enable symlink traversal" am: f589c7b442 am: af80a461d6
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

8 years agoMerge "Support build targets with no installable apps/packages" am: aed6805380 am...
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

8 years agoMerge "build: Add extra build customization for /product" am: a80f1e3257 am: 64ea350dd8
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

8 years agoMerge "build: Add support for defining products in /product" am: acb8a7c1f8 am: 881ec...
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

8 years agoMerge "Don\'t check the host JDK tools when build/core/config.mk is called from envse...
Ying Wang [Tue, 3 Nov 2015 00:45:14 +0000 (00:45 +0000)]
Merge "Don\'t check the host JDK tools when build/core/config.mk is called from envsetup.sh." am: a63d379aab
am: fb89fd36b2

* commit 'fb89fd36b21c557fa4873ad4c707f6dd07752ed0':
  Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh.

8 years agoMerge "Don\'t check the host JDK tools when build/core/config.mk is called from envse...
Ying Wang [Tue, 3 Nov 2015 00:40:38 +0000 (00:40 +0000)]
Merge "Don\'t check the host JDK tools when build/core/config.mk is called from envsetup.sh."
am: a63d379aab

* commit 'a63d379aab75fe3991320319f63faddd3b84b287':
  Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh.

8 years agoMerge "Don't check the host JDK tools when build/core/config.mk is called from envset...
Ying Wang [Tue, 3 Nov 2015 00:17:43 +0000 (00:17 +0000)]
Merge "Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh."

8 years agoDon't check the host JDK tools when build/core/config.mk is called from envsetup.sh.
Ying Wang [Mon, 2 Nov 2015 23:56:58 +0000 (15:56 -0800)]
Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh.

Envsetup.sh (lunch) relies on config.mk to get build varaible values; while
config.mk may rely on envsetup.sh to set up JAVA_HOME/PATH.
Without this change config.mk may be checking the host JDK tools before
JAVA_HOME/PATH get set up.

Change-Id: I1e6b5e33147258832ce2f0a425f9526ef4782c43

8 years agoRemove changing uids/timestamps from zip/jar files
Dan Willemsen [Thu, 29 Oct 2015 23:33:05 +0000 (16:33 -0700)]
Remove changing uids/timestamps from zip/jar files

Pass -X to zip so that Unix UID/GID and extra timestamps aren't
saved into the zip files.

Add a new tool, ziptime, that uses a very stripped down copy of
zipalign. It no longer depends on libandroidfw, and now rewrites the
timestamps in place instead of making a copy of the zipfile. This should
improve speed and reduce disk requirements, especially with the large
packaging zip files.

Bug: 24201956
Change-Id: I50f68669f659da1b4393e964ad40b6aafb00c1e7

8 years agoMerge "envsetup,product,ninja: enable symlink traversal" am: f589c7b442
Gaurav Shah [Mon, 2 Nov 2015 22:30:17 +0000 (22:30 +0000)]
Merge "envsetup,product,ninja: enable symlink traversal" am: f589c7b442
am: af80a461d6

* commit 'af80a461d6ae7d71a2e2976d96bb261cdb0eaed7':
  envsetup,product,ninja: enable symlink traversal

8 years agoMerge "Support build targets with no installable apps/packages" am: aed6805380
Gaurav Shah [Mon, 2 Nov 2015 22:30:10 +0000 (22:30 +0000)]
Merge "Support build targets with no installable apps/packages" am: aed6805380
am: 00b8cd9a15

* commit '00b8cd9a15c81d2660e834a0290c00e6e22d2614':
  Support build targets with no installable apps/packages

8 years agoMerge "build: Add extra build customization for /product" am: a80f1e3257
Gaurav Shah [Mon, 2 Nov 2015 22:30:03 +0000 (22:30 +0000)]
Merge "build: Add extra build customization for /product" am: a80f1e3257
am: 64ea350dd8

* commit '64ea350dd8c2d2b1dc73f753c0bad8e98e12c511':
  build: Add extra build customization for /product

8 years agoMerge "build: Add support for defining products in /product" am: acb8a7c1f8
Gaurav Shah [Mon, 2 Nov 2015 22:29:57 +0000 (22:29 +0000)]
Merge "build: Add support for defining products in /product" am: acb8a7c1f8
am: 881ec090c4

* commit '881ec090c4790bdd588048f17038d167d7b52d87':
  build: Add support for defining products in /product

8 years agoMerge "envsetup,product,ninja: enable symlink traversal"
Gaurav Shah [Mon, 2 Nov 2015 22:27:27 +0000 (22:27 +0000)]
Merge "envsetup,product,ninja: enable symlink traversal"
am: f589c7b442

* commit 'f589c7b442feb02843bdf82305b599b686fc5204':
  envsetup,product,ninja: enable symlink traversal

8 years agoMerge "Support build targets with no installable apps/packages"
Gaurav Shah [Mon, 2 Nov 2015 22:27:20 +0000 (22:27 +0000)]
Merge "Support build targets with no installable apps/packages"
am: aed6805380

* commit 'aed6805380810f51bb0d8b93fc5eac005a6de364':
  Support build targets with no installable apps/packages

8 years agoMerge "build: Add extra build customization for /product"
Gaurav Shah [Mon, 2 Nov 2015 22:27:14 +0000 (22:27 +0000)]
Merge "build: Add extra build customization for /product"
am: a80f1e3257

* commit 'a80f1e32575db5d66f4b4e6efdf79dd10dd2295e':
  build: Add extra build customization for /product

8 years agoMerge "build: Add support for defining products in /product"
Gaurav Shah [Mon, 2 Nov 2015 22:27:08 +0000 (22:27 +0000)]
Merge "build: Add support for defining products in /product"
am: acb8a7c1f8

* commit 'acb8a7c1f8cacaf136edba1a25d64467d352a432':
  build: Add support for defining products in /product

8 years agoMerge "envsetup,product,ninja: enable symlink traversal"
Gaurav Shah [Mon, 2 Nov 2015 22:22:50 +0000 (22:22 +0000)]
Merge "envsetup,product,ninja: enable symlink traversal"

8 years agoMerge "Support build targets with no installable apps/packages"
Gaurav Shah [Mon, 2 Nov 2015 22:22:40 +0000 (22:22 +0000)]
Merge "Support build targets with no installable apps/packages"

8 years agoMerge "build: Add extra build customization for /product"
Gaurav Shah [Mon, 2 Nov 2015 22:22:32 +0000 (22:22 +0000)]
Merge "build: Add extra build customization for /product"