Commit Graph

25437 Commits

Author SHA1 Message Date
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 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
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
Ying Wang 5eb1f1fbf1 am f1b066b5: Merge "Remove duplicate local_time.default"
* commit 'f1b066b5ce3ebec905cb38dbb48a77dc58d4c457':
  Remove duplicate local_time.default
2015-10-15 18:39:45 +00:00
Dan Albert 5baea14363 Merge "Use libgcov OR libclang_rt.profile, not both." 2015-10-15 18:39:42 +00:00
Ying Wang f1b066b5ce Merge "Remove duplicate local_time.default" 2015-10-15 18:35:26 +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
Nick Kralevich f14b0298f6 am 5c24a50e: Merge "generic_x86: delete system_server execmem"
* commit '5c24a50e5fba6aad3319edc0770005e20ac0b9e1':
  generic_x86: delete system_server execmem
2015-10-15 09:46:45 +00:00
Nick Kralevich 5c24a50e5f Merge "generic_x86: delete system_server execmem" 2015-10-15 09:42:17 +00:00
Nick Kralevich 7da1b68236 generic_x86: delete system_server execmem
https://android-review.googlesource.com/175922 removed all uses
of system_server execmem and neverallowed it. The x86 emulator policy
inappropriately includes this rule. Delete it.

Fixes the following build breakage:

  libsepol.report_failure: neverallow on line 473 of external/sepolicy/system_server.te (or line 12452 of policy.conf) violated by allow system_server system_server:process { execmem };
  libsepol.check_assertions: 1 neverallow failures occurred
  Error while expanding policy

Change-Id: I7fbfaa0a09e8f4e8a372d2f1a64bbe58d5302204
2015-10-15 02:37:40 -07: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 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 84c5ae5232 Merge "Use @arg-lsit-file for jar in add-carried-jack-resources" 2015-10-15 01:10:44 +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
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 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 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
Sami Tolvanen 99fe05567b am f635a586: Merge "Disable verity metadata for eng builds"
* commit 'f635a586e8f4790455ef3dad8c1291c9eb95747e':
  Disable verity metadata for eng builds
2015-10-14 20:53:28 +00:00
Sami Tolvanen f635a586e8 Merge "Disable verity metadata for eng builds" 2015-10-14 20:49:32 +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
Ying Wang 191da9bc08 Merge "Let get-prebuilt-src-arch return empty if the input is empty" 2015-10-14 20:41:30 +00:00
Sami Tolvanen 58fbd69729 Disable verity metadata for eng builds
We don't have dm-verity enabled on eng builds, so don't waste time
generating metadata for images.

Change-Id: Ib2c8d459bb50c30dc32a4ea1fdedc152c09a3a0f
(cherry picked from commit beae6395fc)
2015-10-14 18:03:29 +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
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 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 723a26530f Merge "Allow to build against Mac OS X SDK 10.11." 2015-10-14 01:03:10 +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 90ddd58826 Merge "Add all-named-(dirs|files)-under and related" 2015-10-12 23:24:10 +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
Dan Albert 7fbbc5d205 Use libgcov OR libclang_rt.profile, not both.
Using both can cause duplicate symbol errors.

Change-Id: Id8ee13a81d32e3248ff1cdc468f49a26ecde6b57
2015-10-08 14:16:39 -07:00
Bill Yi 96e59f2c34 Merge commit 'f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84' into HEAD 2015-10-08 10:34:18 -07:00
Yohann Roussel 6a8146f2a2 Merge "Ensure dump-words-to-file creates the target" 2015-10-08 08:46:45 +00:00
Chih-Wei Huang 7fa65eec72 Remove duplicate local_time.default
Seems it's copied from target/product/generic_no_telephony.mk
which had duplicate local_time.default before.
(fixed in commit 567ea28838)

Change-Id: I09dcdffc14de08b3d25a5fd08364d38b2712bb08
2015-10-08 15:07:23 +08: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