Commit Graph

25425 Commits

Author SHA1 Message Date
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
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
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
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 a78d357d18 am a9b2f303: am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01
* commit 'a9b2f3030f99650e8af1b7ec35c171801cbcdae6':
  Reverting Android Security Patch Level string back to 2015-10-01
2015-10-06 01:26:51 +00:00
Zach Jang a9b2f3030f am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01
* commit '124a59aecc0323c1c80469c3ad5d22305c279a49':
  Reverting Android Security Patch Level string back to 2015-10-01
2015-10-06 01:21:03 +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
Brian Carlstrom 10abe69478 am b43cf696: am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit 'b43cf69672c72c025f0fe764d49ec950e3b57b81':
  Use $OUT_DIR/filelist when OUT_DIR is set
2015-10-04 20:05:54 +00:00
Brian Carlstrom b43cf69672 am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit '848b8e9d2cc9f8229c95b3f2d9f92c97726ad8a6':
  Use $OUT_DIR/filelist when OUT_DIR is set
2015-10-04 20:00:56 +00:00
Brian Carlstrom 848b8e9d2c am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit 'fa2ce3b38be8889a0ccaa5968ebdeae80f33b0de':
  Use $OUT_DIR/filelist when OUT_DIR is set
2015-10-04 19:53:49 +00:00
Brian Carlstrom fa2ce3b38b am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit 'f73f79f1b63c7cb7679264a6c6e4f86fdd78309c':
  Use $OUT_DIR/filelist when OUT_DIR is set
2015-10-04 19:47:22 +00:00
Brian Carlstrom f73f79f1b6 Merge "Use $OUT_DIR/filelist when OUT_DIR is set" into mnc-dev 2015-10-04 19:40:41 +00: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