Commit Graph

8680 Commits

Author SHA1 Message Date
Colin Cross
a04abc8e23 Add support for LOCAL_SRC_FILES_EXCLUDE
LOCAL_SRC_FILES_EXCLUDE will be used to filter files out of
LOCAL_SRC_FILES.  A common usage will be to use
LOCAL_SRC_FILES_EXCLUDE_<arch> to remove a source file that will be
replaced with an arch-optimized version.

Change-Id: I75cc6114c47fb784bab65cae8f618c4f395f07bb
2015-10-16 17:33:01 -07:00
Ying Wang
76203dcc4c am 08785f11: am 19fcc054: am 19e4741d: Merge "Use direct dependency on the JNI so files."
* commit '08785f116b2f947e8d5a12ae4d1612d82f860d91':
  Use direct dependency on the JNI so files.
2015-10-16 12:08:04 +00:00
Ying Wang
19fcc054bd am 19e4741d: Merge "Use direct dependency on the JNI so files."
* commit '19e4741df60643d4fdb876e77069bb63857a12b2':
  Use direct dependency on the JNI so files.
2015-10-16 01:25:15 +00:00
Ying Wang
19e4741df6 Merge "Use direct dependency on the JNI so files." 2015-10-16 01:19:48 +00:00
Ying Wang
126c791e43 Merge "Strip LOCAL_MODULE before referencing it." 2015-10-16 00:54:52 +00:00
Ying Wang
d358f826e7 Use direct dependency on the JNI so files.
With the order-only dependency if the jni so files is updated,
make won't rebuild the system.img, which has dependency only on the apk
file.

Bug: 24865400
Change-Id: I9d5bee82b8a712a2c24dabaa0cd4c50174ea219f
2015-10-15 17:50:06 -07:00
Ying Wang
4d20a32a79 Strip LOCAL_MODULE before referencing it.
Bug: 24985980
Change-Id: Ic97e852aa7a8bf2d9224d3d6656d33145cc67800
2015-10-15 17:47:09 -07:00
Dan Albert
8c0432b5e1 am 04bb0eef: am b56b2e9a: am 5baea143: Merge "Use libgcov OR libclang_rt.profile, not both."
* commit '04bb0eef90b89672f7aad04a3ce1cab693b9e23e':
  Use libgcov OR libclang_rt.profile, not both.
2015-10-15 19:00:50 +00:00
Dan Albert
b56b2e9aa0 am 5baea143: Merge "Use libgcov OR libclang_rt.profile, not both."
* commit '5baea1436371dea7e14562b17431bcd2b6a55f7d':
  Use libgcov OR libclang_rt.profile, not both.
2015-10-15 18:48:42 +00:00
Dan Albert
5baea14363 Merge "Use libgcov OR libclang_rt.profile, not both." 2015-10-15 18:39:42 +00:00
Steve Fung
f2a3fd5d98 am 31ba99b9: am a6968d8f: am 2af58637: Merge "Add the Product ID to target_files.zip"
* commit '31ba99b9e279b588b584ed90cfc1ca9cc04855cd':
  Add the Product ID to target_files.zip
2015-10-15 18:35:57 +00:00
Steve Fung
a6968d8f1d am 2af58637: Merge "Add the Product ID to target_files.zip"
* commit '2af586376d2b99c75a5672c72a704f2031adc0fe':
  Add the Product ID to target_files.zip
2015-10-15 18:19:52 +00:00
Steve Fung
2af586376d Merge "Add the Product ID to target_files.zip" 2015-10-15 18:13:41 +00:00
Yohann Roussel
d2b2983cc7 Remove LOCAL_JACK_EXTRA_ARGS
Use of DEFAULT_JACK_EXTRA_ARGS and LOCAL_JACK_FLAGS provides all needed
support.

Change-Id: Ic4d20887e1905b65a6608a22a69188429b754e34
2015-10-15 09:24:37 +00:00
Yohann Roussel
c4d5e26cb6 Merge "Allow control of jack used for compilation" 2015-10-15 07:58:42 +00:00
Peter Qiu
a70aaf5897 am a80dfcb6: am cf58d1f5: am 7d3690eb: Merge "Export include path to D-Bus headers for multilib builds"
* commit 'a80dfcb69b0fdae915b4a94ee9549cb173bc03f2':
  Export include path to D-Bus headers for multilib builds
2015-10-15 04:21:02 +00:00
Peter Qiu
cf58d1f5fe am 7d3690eb: Merge "Export include path to D-Bus headers for multilib builds"
* commit '7d3690eb3572477b65c04c7a7964a3367c2f69a6':
  Export include path to D-Bus headers for multilib builds
2015-10-15 04:08:50 +00:00
Peter Qiu
7d3690eb35 Merge "Export include path to D-Bus headers for multilib builds" 2015-10-15 04:00:38 +00:00
Ying Wang
2fbb628ed1 am 8c6af7ba: am ef67c196: am 84c5ae52: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '8c6af7ba8fc66000c97ab6bdfaf98de7653c38d6':
  Use @arg-lsit-file for jar in add-carried-jack-resources
2015-10-15 03:21:30 +00:00
Ying Wang
ef67c1963f am 84c5ae52: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '84c5ae523201f17b94b5b0afe85a9af3f26c8231':
  Use @arg-lsit-file for jar in add-carried-jack-resources
2015-10-15 01:15:34 +00:00
Ying Wang
3a562a9942 Use @arg-lsit-file for jar in add-carried-jack-resources
Don't pass the arg list as argument in any bash command;
Instead store the arg list to the arg list file and
run "jar @arg-lsit-file".
Note we need to quote the arguments in the arg list file.

This fixed "argument list too long" build error on Mac.

Bug: 24789595
Change-Id: I718f84e540d82bb83516824894a473b2961da278
2015-10-14 17:48:21 -07:00
Dan Willemsen
6a66a887ba Stop encoding absolute paths in symbols
GCC & Clang encode the current working directory into the symbol files.
Even if the binaries are stripped before being installed, the build-id
hash will be different. This means that two different checkouts will
produce different installed binaries, even if the sources are identical.

To prevent this, set PWD=/proc/self/cwd, so that it replaces the
absolute path with the static path /proc/self/cwd. With GCC, use
-fdebug-prefix-map to remove that static path. Our clang does not yet
support this flag, but it was merged in r250094.

This does change the behavior when using gdb -- you now need to be in
$ANDROID_BUILD_TOP before gdb will load the sources.

Bug: 24204119
Change-Id: I792d65b042b7a3fdc78d567c5a6e93cdf0141b9b
2015-10-14 17:30:11 -07:00
Peter Qiu
425e01996a Export include path to D-Bus headers for multilib builds
Bug:None

Change-Id: I6e3898c71f54ede08a27f5be93e95a2b219e5ea6
2015-10-14 16:54:48 -07:00
Ying Wang
5b7aaeaa2e am ed4b0eeb: Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""
* commit 'ed4b0eeb435903d9be502dcebd2c000f143df575':
  Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
2015-10-14 23:32:18 +00:00
Ying Wang
e67a16d11d Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
This reverts commit 16f93d5661.

Change-Id: I925dae6a2d07792c61fcd3b6fd8718391ab993f8
2015-10-14 16:25:16 -07:00
Ying Wang
ed4b0eeb43 Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"" 2015-10-14 23:09:14 +00:00
Ying Wang
3bfecc8b65 Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
This reverts commit 16f93d5661.

Change-Id: I925dae6a2d07792c61fcd3b6fd8718391ab993f8
2015-10-14 23:08:53 +00:00
Steve Fung
22d624a904 Add the Product ID to target_files.zip
When using the A/B updater, include the product id string to
target_files.zip.
This is needed by the Omaha backend.

Bug: 24946811
Change-Id: I2ce5f6cffe440c29a1820348ee215c71cec07861
2015-10-14 15:56:50 -07:00
Ying Wang
cdaf2658c0 am ee299938: am 5d012538: am 37572684: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit 'ee299938bf67772efa38544cd2b4475e3fe7269f':
  Use @arg-lsit-file for jar in add-carried-jack-resources
2015-10-14 22:02:13 +00:00
Ying Wang
5d012538fb am 37572684: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '3757268466d8fe9438e45e989728a74f14a162c6':
  Use @arg-lsit-file for jar in add-carried-jack-resources
2015-10-14 21:47:50 +00:00
Ying Wang
3757268466 Merge "Use @arg-lsit-file for jar in add-carried-jack-resources" 2015-10-14 21:43:41 +00:00
Ying Wang
d0e99ac9a3 am ba3f5e9e: am f8c6575f: am 191da9bc: Merge "Let get-prebuilt-src-arch return empty if the input is empty"
* commit 'ba3f5e9e8f2c88d7df20e44092a77542b559fdfc':
  Let get-prebuilt-src-arch return empty if the input is empty
2015-10-14 21:02:05 +00:00
Ying Wang
f8c6575fce am 191da9bc: Merge "Let get-prebuilt-src-arch return empty if the input is empty"
* commit '191da9bc08360409fa2951567e427168a8d1f76d':
  Let get-prebuilt-src-arch return empty if the input is empty
2015-10-14 20:45:49 +00:00
Sami Tolvanen
f99b53143d Error correction: Append codes to verified partitions
Append error-correcting codes to verified partitions provided that
PRODUCT_SUPPORTS_VERITY_FEC is true.

This moves verity metadata to be after the hash tree, and requires
matching changes from
  Ide48f581bbba77aed6132f77b309db71630d81ed

Bug: 21893453
Change-Id: I6945cbab99e214566a1f9d3702333f2dbbc35816
2015-10-14 18:06:20 +01:00
Chih-Wei Huang
74ccefbee5 Let get-prebuilt-src-arch return empty if the input is empty
The list of archs of a pure java apk (no native libs) is empty.
In this case get-prebuilt-src-arch still return 'none'.
If it's set to LOCAL_MODULE_TARGET_ARCH, it makes the apk
be incompatible with the building target. It's not good.

Just return empty in this case.

Change-Id: Ide75cdb08c8480c8e7d3a0ac59f41831fbc18bd5
2015-10-14 18:56:14 +08:00
Yohann Roussel
b68c9a498d Allow control of jack used for compilation
Version of Jack used to compile a module can now be control from
a dedicated mk located in prebuilts/sdk/tools

Bug: 24564814

Change-Id: Ie8120c97e0fa10953d4d015afd27aacfac80e5b6
2015-10-14 11:32:45 +02:00
Dan Willemsen
acde510fd7 am 539c7400: fix merge of all-named-files-under
* commit '539c7400468ba526253bc46771590aa9c68ec392':
  fix merge of all-named-files-under
2015-10-14 04:25:40 +00:00
Dan Willemsen
57e07a4370 am 3dcbc592: am aaa03ede: am b70b496f: am 57a64e01: Add all-named-(dirs|files)-under and related
* commit '3dcbc592a28fdaf62c09e204cba559328139bc66':
  Add all-named-(dirs|files)-under and related
2015-10-14 04:20:28 +00:00
Dan Willemsen
539c740046 fix merge of all-named-files-under
Change-Id: Iad4c30abdcfca1e73a2a3d525dfcea57f92c5c40
2015-10-13 21:17:06 -07:00
Dan Willemsen
3dcbc592a2 am aaa03ede: am b70b496f: am 57a64e01: Add all-named-(dirs|files)-under and related
* commit 'aaa03edef90a758c246da7c5e64dee1d6b3cb771':
  Add all-named-(dirs|files)-under and related
2015-10-14 04:13:22 +00:00
Ying Wang
16f93d5661 Use @arg-lsit-file for jar in add-carried-jack-resources
Don't pass the arg list as argument in any bash command;
Instead store the arg list to the arg list file and
run "jar @arg-lsit-file".

This fixed "argument list too long" build error on Mac.

Bug: 24789595
Change-Id: I3e5cd18fd988f12f0876b152b8bf07d07b56119e
2015-10-13 18:45:16 -07:00
Ying Wang
37d2288be2 am 6613ae1c: am 6bdbcece: am 723a2653: Merge "Allow to build against Mac OS X SDK 10.11."
* commit '6613ae1c8411fb3214a08e8e142a27f140d8734c':
  Allow to build against Mac OS X SDK 10.11.
2015-10-14 01:13:07 +00:00
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
Dan Willemsen
57a64e015c 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-13 16:14:57 -07:00
Dan Willemsen
7a74e5ee0e 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-10-13 16:14:53 -07:00
Dan Willemsen
76a89d3a0a Sort all files found via $(shell find)
Don't rely on filesystem ordering to make these the same for all builds.

Bug: 24204119
Change-Id: I7313062157764091acecf45f4b57405c28858546
2015-10-13 16:14:12 -07:00
Bertrand Simonnet
dc3f1214d9 am 123b060f: am 5df7366e: am f698ca63: Merge "Add the product version to target_files.zip."
* commit '123b060f042349f64e336b5202dc1e2d92e262fd':
  Add the product version to target_files.zip.
2015-10-13 20:22:10 +00: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