Commit graph

25654 commits

Author SHA1 Message Date
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
Colin Cross
52513434ee am 9fc7d3d6: am 2ce7528a: Merge "makeparallel needs global CFLAGS now"
* commit '9fc7d3d61e0e2061e662bfb99f7e86d5a9a68fd8':
  makeparallel needs global CFLAGS now
2015-09-30 05:22:29 +00:00
Colin Cross
9fc7d3d61e am 2ce7528a: Merge "makeparallel needs global CFLAGS now"
* commit '2ce7528a92d132523317dcb1252cf0c47459038b':
  makeparallel needs global CFLAGS now
2015-09-30 05:17:20 +00:00
Colin Cross
2ce7528a92 Merge "makeparallel needs global CFLAGS now" 2015-09-30 05:12:33 +00:00
Colin Cross
8f26a45bb6 makeparallel needs global CFLAGS now
After 3ad3549519 (Don't add CFLAGS to
CPPFLAGS), makeparallel now needs to explicitly include CFLAGS like
kati.

Change-Id: Ib50328da147f03647bb5b99f6d69948d644eece9
2015-09-30 05:11:40 +00:00
Colin Cross
80e46c7c5c Move the dist-as-droid handling from make to ninja
dist is a strange dual-use target, as both a flag and a goal.  make dist
<target> means build <target>, but copy any dist-for-goals files to
$DIST_DIR.  make dist without a target means build droid with
dist-for-goals files.  This requires special handling of MAKECMDGOALS to
detect the case where dist is the only goal, which breaks when ninja.mk
doesn't pass all the goals to kati.  Instead, let ninja handle the
default goal.  Pass dist to kati if it is specified in order to turn on
the dist-for-goal rules, but filter it out of the goals passed to
ninja.  If there are any other goals, ninja will build them.  If there
are no goals, ninja will fall back to the default goal, which is droid.

Change-Id: Iafb184d28cb312cb7c5682cd3ff4f310b2d9f7e9
2015-09-29 17:15:09 -07:00
Dan Willemsen
379f9f9cec Add all-cpp-files-under
There are multiple versions of this in the tree. Let's standardize on
one that will work for everyone, and will sort the results.

Bug: 24204119
Change-Id: I09fcd80e1e8e35e64d8a8a62bbc096f87b02603f
2015-09-29 16:32:28 -07:00
Colin Cross
08c482804e am 1197f00e: am 12d7867f: Merge changes If34a7900,Iaea1f158
* commit '1197f00e40d71ece08523401d4cd74acd2037680':
  Revert "Have all targets in build.ninja"
  Revert "Pass all goals to kati when "dist" is in goals"
2015-09-29 22:54:59 +00:00
Colin Cross
1197f00e40 am 12d7867f: Merge changes If34a7900,Iaea1f158
* commit '12d7867f5fe23203de952b7f876d01d63f8294d1':
  Revert "Have all targets in build.ninja"
  Revert "Pass all goals to kati when "dist" is in goals"
2015-09-29 22:47:50 +00:00
Colin Cross
12d7867f5f Merge changes If34a7900,Iaea1f158
* changes:
  Revert "Have all targets in build.ninja"
  Revert "Pass all goals to kati when "dist" is in goals"
2015-09-29 22:41:42 +00:00
Ying Wang
2948262c12 am e7b833c2: am 98f3c213: am cb31a535: Dist the otatools package.
* commit 'e7b833c24f2d9326d484188aa2026c726ff1422e':
  Dist the otatools package.
2015-09-29 22:09:31 +00:00
Ying Wang
e7b833c24f am 98f3c213: am cb31a535: Dist the otatools package.
* commit '98f3c213df26b7d997d6171882a7f02b90e1cb2b':
  Dist the otatools package.
2015-09-29 22:04:28 +00:00
Ying Wang
98f3c213df am cb31a535: Dist the otatools package.
* commit 'cb31a535077947e45a97ef31a04b6a3b211ceb25':
  Dist the otatools package.
2015-09-29 21:57:09 +00:00
Claes Elgemark
5b08efb73f Don't fail build of otatools if there are no device certificates
Bug: 23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
(cherry picked from commit 8d77197121)
2015-09-29 21:56:03 +00:00
Baligh Uddin
22ff0124fd Merge "add otatools-package target" into cw-d-mr1-dev 2015-09-29 21:53:25 +00:00
Ying Wang
cb31a53507 Dist the otatools package.
Bug: 23495952

(cherry picked from commit 267e957373)

Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
(cherry picked from commit fc028e59c2)
2015-09-29 21:50:48 +00:00
Doug Zongker
173219d81f add otatools-package target
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.

Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit f22b0f43ef)
(cherry picked from commit 32bf3f3265)
2015-09-29 21:50:39 +00:00
Colin Cross
8f9f01bbc3 Revert "Have all targets in build.ninja"
--gen_all_targets seems to be dropping some intermediate targets,
causing problems when kati is passed a goal and then ninja is run with
checkbuild as a goal, for example with:
m -j PRODUCT-aosp_flounder-userdebug checkbuild

This reverts commit 92bbf5667d.

Change-Id: If34a790028f8da98fcc713e3f7000d06c63dcf80
2015-09-29 14:21:24 -07:00
Colin Cross
52b697a488 Revert "Pass all goals to kati when "dist" is in goals"
This isn't actually necessary, dist doesn't use MAKEDISTGOALS other than
to check if it contains any other real targets.  The real issue is
caused by --gen_all_targets, and is broader than just "dist".

This reverts commit d3701e9e96.

Change-Id: Iaea1f158dbd1d4b9035954efef40b33485e6c6b3
2015-09-29 14:20:28 -07:00