Commit graph

25572 commits

Author SHA1 Message Date
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
Ying Wang
4f5f98d037 am 20e017b5: am b1bee75f: am 3d6e194e: am 393c6254: Really include drawables for all densities.
* commit '20e017b56209ecbdc003540fa618b91cbee51418':
  Really include drawables for all densities.
2015-09-29 18:28:43 +00:00
Ying Wang
20e017b562 am b1bee75f: am 3d6e194e: am 393c6254: Really include drawables for all densities.
* commit 'b1bee75f79fb4addd25abb573e67ee66ce1f7ba6':
  Really include drawables for all densities.
2015-09-29 18:21:35 +00:00
Ying Wang
b1bee75f79 am 3d6e194e: am 393c6254: Really include drawables for all densities.
* commit '3d6e194eafbb441c79d4cd306af85eeb34fb75e8':
  Really include drawables for all densities.
2015-09-29 18:13:03 +00:00
Ying Wang
3d6e194eaf am 393c6254: Really include drawables for all densities.
* commit '393c62549a6340b3473f14b71d583e118d7e6a6d':
  Really include drawables for all densities.
2015-09-29 18:07:41 +00: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
Ying Wang
393c62549a Really include drawables for all densities.
Previously with "PRODUCT_AAPT_CONFIG := normal" resource with modifier
"small" isn't included.

Bug: 21643610
Change-Id: I53940d716fb9705462b1abb882e04103e211f8af
2015-09-29 09:57:41 -07: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
03d8b18881 Merge "Have all targets in build.ninja" 2015-09-29 06:55:33 +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
Colin Cross
953981db62 Merge "Don't add dependencies on Makefiles when using ninja" 2015-09-29 01:09:51 +00: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
Colin Cross
a4447e8c89 Don't add dependencies on Makefiles when using ninja
Ninja has an implicit dependency on the command being run, and kati will
regenerate the ninja manifest if any read makefile changes, so there is no
need to have dependencies on makefiles.
This won't catch all the cases where LOCAL_ADDITIONAL_DEPENDENCIES contains
a .mk file, because a few users of LOCAL_ADDITIONAL_DEPENDENCIES don't
include base_rules.mk, but it will fix the most common ones.

Bug: 23566977
Change-Id: I66de882421376303ab7233c8ce7274548f6b2199
2015-09-28 16:29:52 -07:00
Colin Cross
6c3bf1b800 Merge "Use zip -q for adding shared libraries" 2015-09-28 23:23:40 +00:00
Colin Cross
92f8348aeb Use zip -q for adding shared libraries
Make zip quiet when adding shared libraries to apks.

Bug: 24409581
Change-Id: I540510eb6e051b5fc9d1d2a7fa5565a5b774a602
2015-09-28 16:15:09 -07:00