Commit Graph

8323 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Tao Bao
54fee2c407 am 5bd910a5: am 7e9b4ec4: Merge "Pack libdivsufsort.so into otatools.zip."
* commit '5bd910a56e90025539abe432e01c72f3bea15a2d':
  Pack libdivsufsort.so into otatools.zip.
2015-09-29 17:47:49 +00:00
Tao Bao
5bd910a56e am 7e9b4ec4: Merge "Pack libdivsufsort.so into otatools.zip."
* commit '7e9b4ec44c63cb2e89388250aa6547aa6eddcab8':
  Pack libdivsufsort.so into otatools.zip.
2015-09-29 17:42:44 +00:00
Tao Bao
7e9b4ec44c Merge "Pack libdivsufsort.so into otatools.zip." 2015-09-29 17:38:14 +00:00
Colin Cross
c09a2e7ed8 am 96caa978: am 02d04b4d: Merge "Pass all goals to kati when "dist" is in goals"
* commit '96caa97814b2c439030dac0f2fc73aa87627ddcd':
  Pass all goals to kati when "dist" is in goals
2015-09-29 17:18:54 +00:00
Colin Cross
96caa97814 am 02d04b4d: Merge "Pass all goals to kati when "dist" is in goals"
* commit '02d04b4ddceba1a949f2d3d3abf0e5bcb8508cbc':
  Pass all goals to kati when "dist" is in goals
2015-09-29 17:13:24 +00:00
Colin Cross
02d04b4ddc Merge "Pass all goals to kati when "dist" is in goals" 2015-09-29 17:09:03 +00:00
Nicolas Geoffray
9be13a763c am 3f054bdd: am 506857e9: Merge "Make linker configurable through environment."
* commit '3f054bdd0d8201c6ebc7f5037a3af685d8eb8062':
  Make linker configurable through environment.
2015-09-29 09:08:40 +00:00
Nicolas Geoffray
3f054bdd0d am 506857e9: Merge "Make linker configurable through environment."
* commit '506857e974ed1aac60bff96a71d0eb182865bed8':
  Make linker configurable through environment.
2015-09-29 09:04:59 +00:00
Nicolas Geoffray
506857e974 Merge "Make linker configurable through environment." 2015-09-29 08:34:28 +00:00
Shinichiro Hamaji
63fad193a5 am 753550d1: am 03d8b188: Merge "Have all targets in build.ninja"
* commit '753550d153507c2bc69a4aa573e12568dd3a7c4a':
  Have all targets in build.ninja
2015-09-29 07:07:13 +00:00
Shinichiro Hamaji
753550d153 am 03d8b188: Merge "Have all targets in build.ninja"
* commit '03d8b18881d845a22c44727c8156cada16630b49':
  Have all targets in build.ninja
2015-09-29 06:58:51 +00:00
Shinichiro Hamaji
d3701e9e96 Pass all goals to kati when "dist" is in goals
Bug: 24339367
Change-Id: Iee80d65fe169ec005900a96446aa7a432fc68872
2015-09-29 15:52:58 +09:00
Shinichiro Hamaji
92bbf5667d Have all targets in build.ninja
We should pass --gen_all_targets instead of --gen_all_phony_targets
to have targets which are not declared as .PHONY.

Bug: 24384320
Change-Id: I616d8c74e6efd9d69b1a935cfc5116b716f100ff
2015-09-29 14:18:59 +09:00
Shinichiro Hamaji
bd11df9895 am 31966bdb: am ad8df5ad: Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
* commit '31966bdb8c3e4c001736fc714a9baf8fa2c2acb2':
  Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
2015-09-29 04:08:47 +00:00
Shinichiro Hamaji
31966bdb8c am ad8df5ad: Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
* commit 'ad8df5adac7d844014f74c60ce40e3cae02e5eaf':
  Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
2015-09-29 04:03:44 +00:00
Shinichiro Hamaji
ad8df5adac Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 2015-09-29 03:54:59 +00:00
Colin Cross
5acaa9dca0 am 7ee3b85e: resolved conflicts for 953981db to stage-aosp-master
* commit '7ee3b85eba08304cb9e396aaf52a77729f125532':
  Don't add dependencies on Makefiles when using ninja
2015-09-29 01:52:46 +00:00
Colin Cross
7ee3b85eba resolved conflicts for 953981db to stage-aosp-master
Change-Id: Ic1003a594ac5e5e91b124f249a569fb81123e973
2015-09-28 18:45:23 -07:00
Stephen Hines
d11c18a4b0 Fix RS NDK usage so we always pull from "current" instead of NDK 8.
The 8 in this definition refers to NDK release 8, not the API level 8.
Setting it to "current" is better, since it still contains the relevant
target API level (9 in our case) for using/building our RS support APIs.

Change-Id: Ib216ea859e137643fba81c39c4b9d0077ec04455
2015-09-28 18:07:21 -07:00
Colin Cross
5c3edc045b am 98da13bb: resolved conflicts for 6c3bf1b8 to stage-aosp-master
* commit '98da13bbd2db4b2247b90d83deec5e8befbee536':
  Use zip -q for adding shared libraries
2015-09-28 23:49:46 +00:00
Tao Bao
f6d83021d4 Pack libdivsufsort.so into otatools.zip.
This is to support the change to bsdiff which depends on
libdivsufsort.so and libdivsufsort64.so now.

Bug: 24332905
Change-Id: I232fc1b2abda67456f012a83fa4f69a99bc6ea14
2015-09-28 16:42:51 -07:00
Colin Cross
98da13bbd2 resolved conflicts for 6c3bf1b8 to stage-aosp-master
Change-Id: If93ed1d9229f7fbe750f85ea4b3c3e4fce5dbb29
2015-09-28 16:41:45 -07:00