Commit Graph

25985 Commits

Author SHA1 Message Date
Dan Albert 9119f14943 Merge "Allow overriding the LLVM prebuilts path." 2015-11-16 18:28:24 +00:00
Dan Albert 8b1d17706f Allow overriding the LLVM prebuilts path.
The automated build will need to do a two stage build, and we want to
do that without altering the source directory. Building with
`make LLVM_PREBUILTS_BASE=/path/to/prebuilts` will build using an
arbitrary toolchain instead of the installed one.

Bug: http://b/17441393
Change-Id: I4ff5c5224fbb8ebeb3a752907d6c4cd0a925aa1e
2015-11-13 23:06:07 -08:00
Sen Jiang 48ea511512 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.
2015-11-13 19:17:06 +00:00
Sen Jiang 99d5f361b4 Merge "Write AB_OTA_POSTINSTALL_CONFIG to META/postinstall_config.txt." 2015-11-13 19:14:00 +00:00
Sen Jiang 8f22e2a0bb 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
2015-11-13 10:46:09 -08:00
Shinichiro Hamaji 13248f9343 Merge "Use GOMA_HERMETIC=error for USE_GOMA=true build"
am: a50961ae95

* commit 'a50961ae9517cdaab83294e537f35922717e17f9':
  Use GOMA_HERMETIC=error for USE_GOMA=true build
2015-11-13 07:30:53 +00:00
Shinichiro Hamaji a50961ae95 Merge "Use GOMA_HERMETIC=error for USE_GOMA=true build" 2015-11-13 07:26:39 +00:00
Shinichiro Hamaji 21a18b7509 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
2015-11-13 15:53:56 +09:00
Elliott Hughes 8b0e2e5094 Merge "Set WINVER as well as _WIN32_WINNT."
am: 4b6bb08da3

* commit '4b6bb08da308004898ad7db177834f78c808eabb':
  Set WINVER as well as _WIN32_WINNT.
2015-11-13 03:11:39 +00:00
Elliott Hughes 4b6bb08da3 Merge "Set WINVER as well as _WIN32_WINNT." 2015-11-13 03:09:25 +00:00
Dan Willemsen aa725f6769 Merge "Sort dex and static lib resources"
am: 67d993fc9c

* commit '67d993fc9cd01950f8994b7613362ea749be561a':
  Sort dex and static lib resources
2015-11-13 01:44:44 +00:00
Dan Willemsen 67d993fc9c Merge "Sort dex and static lib resources" 2015-11-13 01:39:30 +00:00
Dan Albert 37a9e5d568 Merge "Make not having Jack non-fatal."
am: 5f88dd0dd6

* commit '5f88dd0dd68356679ebdc5991c20bbbad657cc43':
  Make not having Jack non-fatal.
2015-11-13 01:18:32 +00:00
Dan Albert 18ace0f2fe Merge "Allow globally disabling the relocation packer."
am: 6d6ba8aaf1

* commit '6d6ba8aaf19b3f5cb209c0b60c7bfd1900411945':
  Allow globally disabling the relocation packer.
2015-11-13 01:18:24 +00:00
Dan Albert 5f88dd0dd6 Merge "Make not having Jack non-fatal." 2015-11-13 01:16:08 +00:00
Dan Albert 6d6ba8aaf1 Merge "Allow globally disabling the relocation packer." 2015-11-13 01:15:55 +00:00
Dan Albert fd8c722714 Make not having Jack non-fatal.
Not every build needs Java.

Bug: http://b/17441393
Change-Id: Ia55742cfd43c3a4f9c7873b87816bcce99f8156f
2015-11-12 15:29:12 -08:00
Dan Albert 52831d118c 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
2015-11-12 15:27:49 -08:00
Elliott Hughes cf1c15c975 Set WINVER as well as _WIN32_WINNT.
Change-Id: I6ace26d6c25549cf42755423340af07e96e05779
2015-11-12 13:33:20 -08:00
Tao Bao 741c16686e Merge "build: Remove check_prereq."
am: 79dd4b2983

* commit '79dd4b29831b5fe5b6d9627c0b0373374c4e3036':
  build: Remove check_prereq.
2015-11-12 16:46:13 +00:00
Tao Bao 79dd4b2983 Merge "build: Remove check_prereq." 2015-11-12 16:41:45 +00:00
Yohann Roussel 94f86f8877 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
2015-11-12 14:58:19 +01:00
Tao Bao cb4abef523 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
2015-11-11 21:26:29 -08:00
Dan Willemsen 0cfcb599ea Merge "Make uncompressing jni libs in prebuilt APKs reproducible"
am: ae8e6c8cda

* commit 'ae8e6c8cda704277ab84851c475ecd8bf4c484cb':
  Make uncompressing jni libs in prebuilt APKs reproducible
2015-11-12 05:25:24 +00:00
Dan Willemsen ae8e6c8cda Merge "Make uncompressing jni libs in prebuilt APKs reproducible" 2015-11-12 05:23:05 +00:00
Dan Willemsen 44c9fc0c28 Merge "Add tool to diff two target files packages"
am: 5685af316e

* commit '5685af316e5e3f9601c8c56a68cad9b833153268':
  Add tool to diff two target files packages
2015-11-12 05:20:03 +00:00
Dan Willemsen 5685af316e Merge "Add tool to diff two target files packages" 2015-11-12 05:16:29 +00:00
Dan Willemsen 5c64b4e81c 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
2015-11-11 18:26:38 -08:00
Chih-hung Hsieh 5188f77e8f Merge "Revert "Enable gold linker for aarch64.""
am: 98c27a83da

* commit '98c27a83da8caee0ed4e57c596d4f51e182588ef':
  Revert "Enable gold linker for aarch64."
2015-11-12 01:09:32 +00:00
Chih-hung Hsieh 98c27a83da Merge "Revert "Enable gold linker for aarch64."" 2015-11-12 01:04:06 +00:00
Chih-hung Hsieh 65c7b5c6d6 Revert "Enable gold linker for aarch64."
This reverts commit a7f68ee9ea.

Change-Id: I8c15df8ce81859f1b950dbac0a47d7d24c0f4cc2
BUG: 25642296
2015-11-11 23:07:01 +00:00
Ying Wang d54b9e6ba0 Merge "Add suffix .so to use directly libart.so"
am: d1fd823f33

* commit 'd1fd823f3349c55ba1d7e3b022a6bbff9f1f2680':
  Add suffix .so to use directly libart.so
2015-11-11 22:12:24 +00:00
Ying Wang d1fd823f33 Merge "Add suffix .so to use directly libart.so" 2015-11-11 22:05:48 +00:00
Tao Bao 58dcdc41c0 Merge "releasetools: Support generating verify packages."
am: 6af8ef528b

* commit '6af8ef528b97614bbb6cd6733ae5a8bc2fb8fbda':
  releasetools: Support generating verify packages.
2015-11-11 21:58:52 +00:00
Tao Bao 6af8ef528b Merge "releasetools: Support generating verify packages." 2015-11-11 21:53:11 +00:00
Marie Janssen 02156d1469 Merge "envsetup: fix for provision to work on zsh"
am: 4eb44e7a41

* commit '4eb44e7a41666f019cba812943e7e13987bc20cc':
  envsetup: fix for provision to work on zsh
2015-11-11 20:05:50 +00:00
Marie Janssen 4eb44e7a41 Merge "envsetup: fix for provision to work on zsh" 2015-11-11 20:01:13 +00:00
Tao Bao a95168b221 Merge "releasetools: Refactor ota_from_target_files.py."
am: c1c01c6504

* commit 'c1c01c65042a84f9d12a1683451433ebaa111545':
  releasetools: Refactor ota_from_target_files.py.
2015-11-11 19:45:41 +00:00
Tao Bao c1c01c6504 Merge "releasetools: Refactor ota_from_target_files.py." 2015-11-11 19:38:44 +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
Tao Bao 9bc6bb23b5 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
2015-11-10 12:49:33 -08: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
Tao Bao 767e3ac246 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
2015-11-10 12:23:10 -08:00
Marie Janssen 4afc2c0f6f 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
2015-11-10 10:41:15 -08:00
randy.jeong 59bdffa76a 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>
2015-11-10 16:42:49 +09: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 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