Commit Graph

8210 Commits

Author SHA1 Message Date
Ying Wang 6bdbcece58 am 723a2653: Merge "Allow to build against Mac OS X SDK 10.11."
* commit '723a26530f801640e8fb9fe037a9f6ca9abe1f39':
  Allow to build against Mac OS X SDK 10.11.
2015-10-14 01:05:41 +00:00
Ying Wang 16b1b0576c Allow to build against Mac OS X SDK 10.11.
Bug: 24739158
Change-Id: I7c57e141dd02a0d2de5a7a1ccbc72ffe422a8d6f
2015-10-13 18:00:45 -07:00
Bertrand Simonnet 5df7366e12 am f698ca63: Merge "Add the product version to target_files.zip."
* commit 'f698ca63d970e1ed7f9b5c4090d2cf5cfa659e55':
  Add the product version to target_files.zip.
2015-10-13 20:08:37 +00:00
Bertrand Simonnet f698ca63d9 Merge "Add the product version to target_files.zip." 2015-10-13 19:59:42 +00:00
Neil Fuller f0eab40487 am 9d14d317: Merge "Fix for Java 8 toolchain builds"
* commit '9d14d317c8b0f128903db72bfb1cfda0f3468280':
  Fix for Java 8 toolchain builds
2015-10-13 09:14:16 +00:00
Neil Fuller 9d14d317c8 Merge "Fix for Java 8 toolchain builds" 2015-10-13 08:26:16 +00:00
Shinichiro Hamaji c016366dc8 am b7462534: Merge "Stop passing --gen_all_phony_targets to kati"
* commit 'b7462534f23145b8413fdd631fe419d0e38b335a':
  Stop passing --gen_all_phony_targets to kati
2015-10-13 05:39:04 +00:00
Shinichiro Hamaji b7462534f2 Merge "Stop passing --gen_all_phony_targets to kati" 2015-10-13 05:35:50 +00:00
Dan Willemsen 518d732c62 am 90ddd588: Merge "Add all-named-(dirs|files)-under and related"
* commit '90ddd58826c65f3d8d8aad197d5dbd8e3036199c':
  Add all-named-(dirs|files)-under and related
2015-10-12 23:28:41 +00:00
Dan Willemsen 92f5fcc5b3 Add all-named-(dirs|files)-under and related
To consolidate the number of places that we're using 'find' in the tree,
add some more helpers:

  all-named-dirs-under
  all-subdir-named-dirs
  all-named-files-under
  all-subdir-named-files

This change also makes many of the current helpers use these helpers
instead of using their own implementation.

The 'dirs' helpers are using '-type d' so that they only output
directories. It's probably safe to use '-type f' for the files helpers,
but that increased the kati load time by ~20%.

Bug: 24204119
Change-Id: I3312e2fe8c146f10955e1d986ad15d9c8be494e1
2015-10-12 15:32:28 -07:00
Neil Fuller e8304ef768 Fix for Java 8 toolchain builds
We don't need to assume the OpenJDK (i.e. for Mac builds).

Change-Id: I1ac1856813045c7b1478dee6b08ad7b49300e4d7
2015-10-12 17:29:45 +01:00
Bertrand SIMONNET 4af7259c2d Add the product version to target_files.zip.
When using the A/B updater, include the product version string to
target_files.zip.
This is needed by the Omaha backend.

BUG: 24743570
Change-Id: Idaba06624c1de452b1e1f9d3ebec851229af987a
2015-10-08 16:10:04 -07:00
Bill Yi 96e59f2c34 Merge commit 'f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84' into HEAD 2015-10-08 10:34:18 -07:00
Shinichiro Hamaji ecea601b8a Stop passing --gen_all_phony_targets to kati
6ff74ce8ee

should have made this workaround unnecessary. Now, even with
old build/core, "m -j32 PRODUCT-aosp_mips64-eng dist" does not
output a ninja file with "$(cat )".

Bug: 24384320
Change-Id: I262edf00dce39f39ec4e55d5ed7b1b6f8d931f33
2015-10-08 15:25:16 +09:00
Yohann Roussel f8c63cbac2 Ensure dump-words-to-file creates the target
Even if word list is empty.

Not creating the file was causing print of error messages that were
not preventing compilation to continue when compiling Java module with
no source.

Change-Id: I095b85f85ed6fcef5882afa39d4af51b78124c7c
2015-10-07 09:34:42 +02:00
Zach Jang f414f45e1d am a78d357d: am a9b2f303: am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01
* commit 'a78d357d185c1bd45e52ad110d59b53540f2949c':
  Reverting Android Security Patch Level string back to 2015-10-01
2015-10-06 01:33:27 +00:00
Zach Jang 124a59aecc Reverting Android Security Patch Level string back to 2015-10-01
Change-Id: I0ecc1c9103e7686dffcb8b7009d52aa8d546ae0b
2015-10-05 18:01:12 -07:00
Steve Fung a9722e2927 am 9782fc4c: am 46fbaa56: Merge "Exclude OTA/bin tools when using A/B OTA updater"
* commit '9782fc4cddac3e31e1e08b1ec86fc61c84a943ec':
  Exclude OTA/bin tools when using A/B OTA updater
2015-10-03 02:02:38 +00:00
Steve Fung 9782fc4cdd am 46fbaa56: Merge "Exclude OTA/bin tools when using A/B OTA updater"
* commit '46fbaa564071e682e3cef7580723249af153ca71':
  Exclude OTA/bin tools when using A/B OTA updater
2015-10-03 01:55:34 +00:00
Steve Fung 46fbaa5640 Merge "Exclude OTA/bin tools when using A/B OTA updater" 2015-10-03 01:50:54 +00:00
Colin Cross acf00a8c17 am d98fe91a: am 6b02b76a: Merge "Fix gcc color diagnostics"
* commit 'd98fe91a7524d40808ae4ed562aeb38e9eedf593':
  Fix gcc color diagnostics
2015-10-03 00:51:02 +00:00
Colin Cross d98fe91a75 am 6b02b76a: Merge "Fix gcc color diagnostics"
* commit '6b02b76ab9ebb5c21743abc5616379d19bc1c304':
  Fix gcc color diagnostics
2015-10-03 00:43:23 +00:00
Steve Fung 48e49f592f Exclude OTA/bin tools when using A/B OTA updater
The OTA/bin tools are not needed in the target files zip when using
the A/B OTA updater.

Bug: 24577767
Change-Id: I7938a906e4d73709aaa944e8065f922536072e27
2015-10-02 17:23:14 -07:00
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 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 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
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