Commit Graph

26624 Commits

Author SHA1 Message Date
Nicolas Geoffray 3b6db9c4c5 Merge "Make jit the default for all builds." 2015-11-11 08:47:36 +00:00
Dan Willemsen 2fb3ecbc6e Merge "Create reproducible NOTICE collections" am: 92d746d158 am: eb861a7bc1
am: bcdc6f10a0

* commit 'bcdc6f10a03b9c22d3fbe23632703801fafc8b00':
  Create reproducible NOTICE collections
2015-11-10 21:50:36 +00:00
Dan Willemsen bcdc6f10a0 Merge "Create reproducible NOTICE collections" am: 92d746d158
am: eb861a7bc1

* commit 'eb861a7bc1df3b53ce1e826fadf45972eeb18597':
  Create reproducible NOTICE collections
2015-11-10 21:48:11 +00:00
Dan Willemsen eb861a7bc1 Merge "Create reproducible NOTICE collections"
am: 92d746d158

* commit '92d746d1580054722e0bdab9283f515a69e9c1ec':
  Create reproducible NOTICE collections
2015-11-10 21:46:09 +00:00
Dan Willemsen 92d746d158 Merge "Create reproducible NOTICE collections" 2015-11-10 21:42:55 +00:00
Dan Willemsen 8ae4984c2c 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
2015-11-10 12:37:23 -08:00
Stephen Hines 87ad6ce7fc 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).
2015-11-10 06:06:34 +00:00
Stephen Hines ea4e438158 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).
2015-11-10 06:03:55 +00:00
Stephen Hines 3f83ed0181 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).
2015-11-10 06:01:47 +00:00
Stephen Hines 106eb619e2 Merge "Switch from clang 3.6 to new clang repository (with 3.8)." 2015-11-10 05:59:40 +00:00
Stephen Hines e8119e96fc Switch from clang 3.6 to new clang repository (with 3.8).
This reverts commit f7dbab16ff.

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().
2015-11-09 16:32:11 -08:00
Lee Campbell e7d5d9f46c Merge "build: Add LINUX_KERNEL_COPYING license file" am: 8b2c37c953 am: 5bd31df419
am: b1c8a7ee94

* commit 'b1c8a7ee9454ca6c43a6d3257563b13b710d86e5':
  build: Add LINUX_KERNEL_COPYING license file
2015-11-09 20:53:44 +00:00
Lee Campbell b1c8a7ee94 Merge "build: Add LINUX_KERNEL_COPYING license file" am: 8b2c37c953
am: 5bd31df419

* commit '5bd31df419703087fd05bc4e3ecf146d9a0fe141':
  build: Add LINUX_KERNEL_COPYING license file
2015-11-09 20:50:27 +00:00
Lee Campbell 5bd31df419 Merge "build: Add LINUX_KERNEL_COPYING license file"
am: 8b2c37c953

* commit '8b2c37c9533f94f81fd8b15257c56061ce10998c':
  build: Add LINUX_KERNEL_COPYING license file
2015-11-09 20:47:25 +00:00
Lee Campbell 8b2c37c953 Merge "build: Add LINUX_KERNEL_COPYING license file" 2015-11-09 20:41:08 +00:00
Lee Campbell b463fcde80 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
2015-11-09 02:27:01 +01:00
Griff Hazen 56d08cb814 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
2015-11-08 18:15:58 +00:00
Griff Hazen 02023eff3b 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
2015-11-08 18:14:27 +00:00
Griff Hazen 83c07e93c9 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
2015-11-08 01:06:15 +00:00
Griff Hazen 9707c5d724 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
2015-11-08 01:03:33 +00:00
Griff Hazen 3943e48c6e 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
2015-11-08 01:00:58 +00:00
Griff Hazen 2e4314481e 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
2015-11-08 01:00:57 +00:00
Griff Hazen 0b4529239f Merge "Let qemu_props service set system properties in ro.emu and ro.emulator" 2015-11-08 00:59:09 +00:00
Griff Hazen 0517540e8d 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
2015-11-07 16:53:59 -08:00
Griff Hazen 20ed978ada 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
2015-11-07 16:44:54 -08:00
Ying Wang 3799a8a534 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
2015-11-06 19:36:43 +00:00
Ying Wang 1704a32d40 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
2015-11-06 19:32:48 +00:00
Ying Wang 7c09c937b6 Merge "Tag "tests" alone doesn\'t prevent including emma.jar"
am: a23a97e3bf

* commit 'a23a97e3bf77bdd7fa01cd1f681d758a943db63a':
  Tag "tests" alone doesn't prevent including emma.jar
2015-11-06 19:31:00 +00:00
Ying Wang a23a97e3bf Merge "Tag "tests" alone doesn't prevent including emma.jar" 2015-11-06 19:27:52 +00:00
Ying Wang 324ffb2785 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
2015-11-06 11:22:28 -08:00
Steve Fung ce99cbca6c 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
2015-11-06 03:28:04 +00:00
Dan Willemsen 33e7b91442 Merge "Use explicitly sized types in zipalign/ziptime" am: 1b2685137e am: 163196aa48
am: 4ad4bd5817

* commit '4ad4bd58173e9ab6ab98e2112ce44ee1c45438ae':
  Use explicitly sized types in zipalign/ziptime
2015-11-06 03:27:57 +00:00
Steve Fung 60bc4bf8fc 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
2015-11-06 03:25:42 +00:00
Steve Fung dc43cddbf6 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
2015-11-06 03:23:31 +00:00
Steve Fung 53a6fd6498 Merge "Add the build type to META folder in target files.zip" 2015-11-06 03:18:35 +00:00
Steve Fung 4044b38f0a 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
2015-11-05 15:04:11 -08:00
Dan Willemsen 4ad4bd5817 Merge "Use explicitly sized types in zipalign/ziptime" am: 1b2685137e
am: 163196aa48

* commit '163196aa481eb8d279822ff93027526ca2c189c1':
  Use explicitly sized types in zipalign/ziptime
2015-11-05 20:35:26 +00:00
Dan Willemsen 163196aa48 Merge "Use explicitly sized types in zipalign/ziptime"
am: 1b2685137e

* commit '1b2685137ee9cde6ea24ff37b54c5d8e1ee18b01':
  Use explicitly sized types in zipalign/ziptime
2015-11-05 20:32:46 +00:00
Dan Willemsen 1b2685137e Merge "Use explicitly sized types in zipalign/ziptime" 2015-11-05 20:28:20 +00:00
Nicolas Geoffray 56a84e1b6c Make jit the default for all builds.
Change-Id: Ifa4280cdab0747cae8d3e2becec47b230846def6
2015-11-05 18:02:13 +00:00
Than McIntosh 7d8c308814 Merge "Enable gold linker for aarch64." am: 838ad09b17 am: fbf9234233
am: 4f75b8053f

* commit '4f75b8053fee2067de736178ff22ac2d7d9af71f':
  Enable gold linker for aarch64.
2015-11-05 11:57:47 +00:00
Than McIntosh 4f75b8053f Merge "Enable gold linker for aarch64." am: 838ad09b17
am: fbf9234233

* commit 'fbf92342335ce2df25c0c61d58c22f62cffa5de1':
  Enable gold linker for aarch64.
2015-11-05 11:55:11 +00:00
Than McIntosh fbf9234233 Merge "Enable gold linker for aarch64."
am: 838ad09b17

* commit '838ad09b17c6525122e6e8881674030e6746a8c4':
  Enable gold linker for aarch64.
2015-11-05 11:52:25 +00:00
Than McIntosh 838ad09b17 Merge "Enable gold linker for aarch64." 2015-11-05 11:49:56 +00:00
Shinichiro Hamaji 93ee2b5869 Merge "Allow missing SONAME in .toc files" am: 457345e58c am: 7070e5dc59
am: ad397422b4

* commit 'ad397422b4da3f5faff4e2ca69d4596b97e4bd61':
  Allow missing SONAME in .toc files
2015-11-05 04:11:52 +00:00
Shinichiro Hamaji ad397422b4 Merge "Allow missing SONAME in .toc files" am: 457345e58c
am: 7070e5dc59

* commit '7070e5dc596376803802dd91aa9b446ee0571e5a':
  Allow missing SONAME in .toc files
2015-11-05 04:09:59 +00:00
Shinichiro Hamaji 7070e5dc59 Merge "Allow missing SONAME in .toc files"
am: 457345e58c

* commit '457345e58c9f273a467847e2086318d6d8380d5b':
  Allow missing SONAME in .toc files
2015-11-05 04:07:21 +00:00
Shinichiro Hamaji 457345e58c Merge "Allow missing SONAME in .toc files" 2015-11-05 04:02:37 +00:00
Shinichiro Hamaji f0972f7966 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
2015-11-05 12:51:08 +09:00
Shinichiro Hamaji 4f23722dd9 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
2015-11-05 01:33:46 +00:00