Commit graph

25572 commits

Author SHA1 Message Date
Colin Cross
12adaf5cb9 Fix gcc color diagnostics
gcc color diagnostics stopped working when the flag was moved to
TARGET_GLOBAL_CFLAGS, as that gets overwritten by combo/select.mk.  Put
it back in COMMON_GLOBAL_CFLAGS, and then let the windows build filter
it out, similar to the way clang deals with unknown flags.

Change-Id: I2db221edb893d81f199494e7515d1b9282c12fae
2015-10-02 16:42:10 -07:00
Colin Cross
2f09a63381 am 210d2d08: am b9599804: Merge "Move the dist-as-droid handling from make to ninja"
* commit '210d2d0863c5d64695e2509d80144d69b5917ecf':
  Move the dist-as-droid handling from make to ninja
2015-10-02 18:08:41 +00:00
Colin Cross
210d2d0863 am b9599804: Merge "Move the dist-as-droid handling from make to ninja"
* commit 'b9599804877f00fd1efddb18f779216efae14d4f':
  Move the dist-as-droid handling from make to ninja
2015-10-02 18:04:18 +00:00
Colin Cross
b959980487 Merge "Move the dist-as-droid handling from make to ninja" 2015-10-02 17:58:20 +00:00
Alex Deymo
f9bd3d82f1 am 35907067: am e89dd69c: Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
* commit '3590706735ac41b6956ef07de20cac3994a046f2':
  Pack META/ab_partitions.txt when using the A/B OTA updater.
2015-10-02 03:52:50 +00:00
Alex Deymo
3590706735 am e89dd69c: Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
* commit 'e89dd69c7632e23bf1cf7db5be1cf1b0f6f345f8':
  Pack META/ab_partitions.txt when using the A/B OTA updater.
2015-10-02 03:46:07 +00:00
Alex Deymo
e89dd69c76 Merge "Pack META/ab_partitions.txt when using the A/B OTA updater." 2015-10-02 03:40:47 +00:00
Alex Deymo
8925d334c3 Pack META/ab_partitions.txt when using the A/B OTA updater.
The list of A/B partitions updated is product-specific. Normally you
would update boot and system, but the product could require to update
other partitions during a system update. This patch packages the list
of A/B partitions configured to be updated when using the A/B updater.
The list can be set in the product makefile by setting the make
variable UPDATE_AB_PARTITIONS.

Bug: 24387863
Test: `make dist` creates the META/ab_partitions.txt in the target_files.zip

Change-Id: I4226ab05c7c7cd74721b06f1da64c6cf4d0e52ac
2015-10-01 19:31:18 -07:00
Colin Cross
3b10364b92 am f17f8b49: am 6ec320df: Merge "Have all targets in build.ninja"
* commit 'f17f8b49c92d5a10537cc28f29039e07b1ec17a5':
  Have all targets in build.ninja
2015-10-01 22:59:56 +00:00
Colin Cross
f17f8b49c9 am 6ec320df: Merge "Have all targets in build.ninja"
* commit '6ec320df174b6f1dd17023e20fc642f89bb83b4c':
  Have all targets in build.ninja
2015-10-01 22:11:27 +00:00
Colin Cross
6ec320df17 Merge "Have all targets in build.ninja" 2015-10-01 21:13:03 +00:00
Kenny Root
7868208bdc am c58e9de8: am 9df1cb50: Merge "Remove old grandfathered ALL_PREBUILTS"
* commit 'c58e9de8078aedc7b290e15d14ef436860909d55':
  Remove old grandfathered ALL_PREBUILTS
2015-10-01 18:10:46 +00:00
Kenny Root
c58e9de807 am 9df1cb50: Merge "Remove old grandfathered ALL_PREBUILTS"
* commit '9df1cb507d4d3442c75ca083670bf06938c7d66e':
  Remove old grandfathered ALL_PREBUILTS
2015-10-01 18:05:48 +00:00
Kenny Root
9df1cb507d Merge "Remove old grandfathered ALL_PREBUILTS" 2015-10-01 17:55:05 +00:00
Stephen Hines
1332828b6e Switch from clang 3.6 to new clang repository (with 3.8).
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().

Change-Id: I8a67461b45f5f1dd9f2d179b6b64a4ca905e999f
2015-10-01 10:42:15 -07:00
Claes Elgemark
afa0158ac4 am 8d7715ed: am 1b045b3d: am 5b08efb7: (-s ours) Don\'t fail build of otatools if there are no device certificates
* commit '8d7715ed44b4af7d3c6cdb8828616c10e33fb612':
  Don't fail build of otatools if there are no device certificates
2015-10-01 14:12:48 +00:00
Claes Elgemark
8d7715ed44 am 1b045b3d: am 5b08efb7: (-s ours) Don\'t fail build of otatools if there are no device certificates
* commit '1b045b3d66fb18ecf7deec31dd4fd33993f5ae83':
  Don't fail build of otatools if there are no device certificates
2015-10-01 14:07:49 +00:00
Claes Elgemark
1b045b3d66 am 5b08efb7: (-s ours) Don\'t fail build of otatools if there are no device certificates
* commit '5b08efb73f1b114f6dfdb52284738f7210d0cf7e':
  Don't fail build of otatools if there are no device certificates
2015-10-01 14:03:40 +00:00
Stephen Hines
46eac3120a am ba2355c9: resolved conflicts for 9073a5d9 to stage-aosp-master
* commit 'ba2355c9810ad3113e0705d106b28d9cdcbee759':
  Fix RS NDK usage so we always pull from "current" instead of NDK 8.
2015-10-01 05:38:06 +00:00
Stephen Hines
ba2355c981 resolved conflicts for 9073a5d9 to stage-aosp-master
Change-Id: I9b048cb5fe70215a67ef025e8c7ef6aad86cffb3
2015-09-30 22:32:05 -07:00
Stephen Hines
9073a5d9a5 Merge "Fix RS NDK usage so we always pull from "current" instead of NDK 8." 2015-10-01 05:19:50 +00:00
Brian Carlstrom
f2257427d9 Use $OUT_DIR/filelist when OUT_DIR is set
Change-Id: Iadf3f05e752d71371d3d74e670ade3e937b1cd92
2015-09-30 20:36:15 -07:00
Tao Bao
128f01cf58 am ce9635ec: am 2124d7e1: Merge "Only use a fixed timestamp when packaging."
* commit 'ce9635ec7ad6bcc6b9bc74136edb91847fe9e4ff':
  Only use a fixed timestamp when packaging.
2015-10-01 00:00:06 +00:00
Dan Willemsen
7c4b2cedd6 am 05bb4fed: am edc3e6cd: Merge "Sort more instances of wildcard and find"
* commit '05bb4fed0d0e701ba13fef5f20b57eb1642cc40a':
  Sort more instances of wildcard and find
2015-09-30 23:59:46 +00:00
Dan Willemsen
6199d28dc9 am 24b5fcf9: am 604e532f: Merge "Add all-cpp-files-under"
* commit '24b5fcf92aeba5a17bf0b4d1720318602cf51a16':
  Add all-cpp-files-under
2015-09-30 23:59:45 +00:00
Tao Bao
ce9635ec7a am 2124d7e1: Merge "Only use a fixed timestamp when packaging."
* commit '2124d7e1e2dec91ce4ab15c6a215d61f7693a8d6':
  Only use a fixed timestamp when packaging.
2015-09-30 23:50:49 +00:00
Tao Bao
2124d7e1e2 Merge "Only use a fixed timestamp when packaging." 2015-09-30 23:45:45 +00:00
Dan Willemsen
05bb4fed0d am edc3e6cd: Merge "Sort more instances of wildcard and find"
* commit 'edc3e6cd6a0d6af4df3d6f07f40de17980b66ad0':
  Sort more instances of wildcard and find
2015-09-30 23:44:10 +00:00
Dan Willemsen
24b5fcf92a am 604e532f: Merge "Add all-cpp-files-under"
* commit '604e532f842fa38982eb47708e3afb5415ba4b72':
  Add all-cpp-files-under
2015-09-30 23:44:01 +00:00
Tao Bao
822f5840c0 Only use a fixed timestamp when packaging.
[1] changed to use a fixed timestamp for all the generated images
(either the one under $ANDROID_PRODUCT_OUT/ or the one added into the
target_files zip). It makes 'adb sync' after 'fastboot flashall' to
resync all the files. This CL changes to use a fixed timestamp only when
packaging into the target_files zip.

[1]: commit 052ae3542b

Bug: 24377993
Bug: 24536411
Change-Id: I209318966109fd4902468dfe96caf777464f9fe1
2015-09-30 16:01:14 -07:00
Colin Cross
b4a4278595 Have all targets in build.ninja
We should pass --gen_all_targets to have targets which are not declared
as .PHONY.  However, this triggers some nasty behavior inherited from
make, where targets can get variables from things that depend on them.
--gen_all_targets will traverse the targets starting at random points in
the dependency tree, and any variables set higher in the tree will not
be visible.  To work around this, keep --gen_all_phony_targets, which
will start traversing at the phony targets first.  This will enter the
tree traversal at points we know don't use inherited variables, like
checkbuild or the PARSE_TIME_MAKE_GOALS, and will reach all the
dependencies that use inherited variables in the right order.
--gen_all_targets will then fill in any remaining targets that were not
in the main dependency tree, and hopefully none of them use any
inherited variables.

Bug: 24384320
Change-Id: I1ff07b7ef26e9481baae678e7fe0933b6d05f2a7
2015-09-30 15:43:50 -07:00
Dan Willemsen
edc3e6cd6a Merge "Sort more instances of wildcard and find" 2015-09-30 22:36:30 +00:00
Dan Willemsen
7c3e3f8314 Sort more instances of wildcard and find
Many of these may not make a difference in the output images, but it's a
good idea to keep the make system as repeatable as possible.

Change-Id: I31804b8ad5805148ed08be7426a242a16f4d0df3
2015-09-30 22:25:49 +00:00
Dan Willemsen
604e532f84 Merge "Add all-cpp-files-under" 2015-09-30 22:15:50 +00:00
David Zeuthen
fe082ea376 am 2fb9d090: am 0238e879: Merge "envsetup.sh: Add \'provision\' function."
* commit '2fb9d0904f25f01cbe87603abad0fc55bccdeaf4':
  envsetup.sh: Add 'provision' function.
2015-09-30 21:59:11 +00:00
Kenny Root
445e87bec9 Remove old grandfathered ALL_PREBUILTS
Many of the packages on ALL_PREBUILTS grandfathered list are no longer
in the tree. Remove them to whittle the list down, so we can tackle the
remaining items.

Change-Id: Id6c026727ed7bef36d1803719df05d2e50afc5cc
2015-09-30 14:53:53 -07:00
David Zeuthen
2fb9d0904f am 0238e879: Merge "envsetup.sh: Add \'provision\' function."
* commit '0238e879893bbbbab4e75b0fd1355c43547ca31e':
  envsetup.sh: Add 'provision' function.
2015-09-30 21:51:55 +00:00
Colin Cross
d5333e7060 am 850ca4fd: am cd7bcd86: Merge "Move ninja files to "
* commit '850ca4fd372b532e3edf7b85ec399901ffd51b84':
  Move ninja files to $(OUT_DIR)
2015-09-30 21:48:16 +00:00
David Zeuthen
0238e87989 Merge "envsetup.sh: Add 'provision' function." 2015-09-30 21:45:40 +00:00
Colin Cross
850ca4fd37 am cd7bcd86: Merge "Move ninja files to "
* commit 'cd7bcd86e5b7a8ba5cd6dde7dda04cadcf656e56':
  Move ninja files to $(OUT_DIR)
2015-09-30 21:43:14 +00:00
Colin Cross
cd7bcd86e5 Merge "Move ninja files to $(OUT_DIR)" 2015-09-30 21:35:52 +00:00
Colin Cross
ebf32c2236 Move ninja files to $(OUT_DIR)
Move the ninja files from $(PRODUCT_OUT)/build.ninja to
$(OUT_DIR)/build-$(TARGET_PRODUCT).ninja.  This will improve incremental
builds of host modules after swithing target products, because the
.ninja_deps file will be accurate across builds.

Change-Id: Ia12746ccde0de31f6fccd111b2bdbd48fc6900d7
2015-09-30 21:35:40 +00:00
David Zeuthen
1b126ffedc envsetup.sh: Add 'provision' function.
This will run ${ANDROID_PRODUCT_OUT}/provision-device which in turn can
run fastboot (and other vendor-specific bits, if needed) to repartition
the device and reflash all partitions with known versions. Options
passed to the 'provision' command will be passed on to said script which
is expected to pass them on to fastboot.

Since this is a rather destructive operation involving data loss etc.,
user confirmation is required. This confirmation can be bypassed using
the option --no-confirmation.

Change-Id: Iec5667f2f5070b95d2eb70ad1b2984909ae4184c
2015-09-30 17:18:22 -04:00
Alex Deymo
48ab56c5cd am dbfe5a7e: am 06ba28c3: Merge "Pack the update_engine_config.txt when using the A/B OTA updater."
* commit 'dbfe5a7ecb3d891201ffcb255d4d6af62b5d07ff':
  Pack the update_engine_config.txt when using the A/B OTA updater.
2015-09-30 20:16:46 +00:00
Baligh Uddin
cad87881cd am dffe42e7: am d9cdf5be: am 22ff0124: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev
* commit 'dffe42e7f6868878cf70a725e266fc0d872d7f23':
  add otatools-package target
2015-09-30 20:15:34 +00:00
Baligh Uddin
dffe42e7f6 am d9cdf5be: am 22ff0124: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev
* commit 'd9cdf5be20b8804d289da24e60724245ad7d15eb':
  add otatools-package target
2015-09-30 20:11:08 +00:00
Alex Deymo
dbfe5a7ecb am 06ba28c3: Merge "Pack the update_engine_config.txt when using the A/B OTA updater."
* commit '06ba28c31e9bea93ae3e3994bfe766a0a4a0073e':
  Pack the update_engine_config.txt when using the A/B OTA updater.
2015-09-30 20:10:45 +00:00
Baligh Uddin
d9cdf5be20 am 22ff0124: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev
* commit '22ff0124fdde970072cea303b4328024994cd78c':
  add otatools-package target
2015-09-30 18:39:15 +00:00
Alex Deymo
06ba28c31e Merge "Pack the update_engine_config.txt when using the A/B OTA updater." 2015-09-30 18:08:20 +00:00
Alex Deymo
70067acd66 Pack the update_engine_config.txt when using the A/B OTA updater.
This config file pulled directly from the source specifies the update
payload version supported by the code. When generating an incremental
update payload for the A/B updater, the generated payload format will
match the version supported by the old version.

Bug: 24406755
Test: `make dist` on Brillo.

Change-Id: Ib7ac6828d0d34eb31e786dbaae5d59ecf26c3576
2015-09-30 09:54:36 -07:00