Commit Graph

25708 Commits

Author SHA1 Message Date
Tao Bao bc5e85afc9 Merge "DO NOT MERGE releasetools: Always write the last block if it's padded." into mnc-dev 2015-10-17 01:15:39 +00:00
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
Tao Bao 15e44d3857 am 9cc6c37a: am 5631d5c6: am 46ae586a: am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '9cc6c37a54626a4d23599fa8d86ffe0bcabec55a':
  DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
2015-10-17 00:21:47 +00:00
Tao Bao 9cc6c37a54 am 5631d5c6: am 46ae586a: am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '5631d5c6e12937fd50ef576c6cff1c7ed7c5ae1b':
  DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
2015-10-17 00:18:27 +00:00
Tao Bao 5631d5c6e1 am 46ae586a: am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '46ae586ab26f5bf63baaac6c68942f1bfba4addc':
  DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
2015-10-17 00:13:36 +00:00
Tao Bao 46ae586ab2 am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit 'e09359abc0f8c29fbb16d35ab7375d80fde6f931':
  DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
2015-10-17 00:09:35 +00:00
Tao Bao 88aea00628 am 6ce8ae76: am ac39bef4: Merge "common.py: Fix the build."
* commit '6ce8ae761b8a238ce215638510230baed277235f':
  common.py: Fix the build.
2015-10-16 22:50:39 +00:00
Tao Bao e09359abc0 DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
When building incremental packages, the info_dict from the source build
should be the one in use. We have done that for most of the partitions
(system and etc.), and should pass that to vendor's script as well.

Also includes the CL in commit aac4ad56b6
that fixes a bug in commit 6f0b219ac5.

Bug: 24898607
Change-Id: I4ea6037dad7061e1683661fc4c394fa3a7a7c5cd
(cherry picked from commit 6f0b219ac5)
2015-10-16 15:47:51 -07:00
Tao Bao 6ce8ae761b am ac39bef4: Merge "common.py: Fix the build."
* commit 'ac39bef43fb032bff75b8558f54107e733355265':
  common.py: Fix the build.
2015-10-16 15:46:31 -07:00
Tao Bao ac39bef43f Merge "common.py: Fix the build." 2015-10-16 22:41:45 +00:00
Tao Bao aac4ad56b6 common.py: Fix the build.
Should only use source_info_dict when creating incremental OTAs.

Change-Id: I6a4e5f8fa3613a1b36563ec915e433247965a2b8
2015-10-16 15:28:00 -07:00
Tao Bao db078f5166 am 63e63c2a: am 543b28d4: Merge "Pass source\'s info_dict to vendor\'s releasetools.py."
* commit '63e63c2a0754e726d6f810588a0314a79268f404':
  Pass source's info_dict to vendor's releasetools.py.
2015-10-16 21:55:46 +00:00
Tao Bao 63e63c2a07 am 543b28d4: Merge "Pass source\'s info_dict to vendor\'s releasetools.py."
* commit '543b28d42f8fdebe011a906826251ab8df70a226':
  Pass source's info_dict to vendor's releasetools.py.
2015-10-16 14:49:40 -07:00
Tao Bao 3203bc10f0 DO NOT MERGE releasetools: Always write the last block if it's padded.
In BBOTAs if the last block of a DataImage is padded, we should always
write the whole block even for incremental OTAs. Because otherwise the
last block may be skipped if unchanged, but would fail the post-install
verification if it has non-zero contents in the padding bytes.

Bug: 24981812
Change-Id: Id0608384fcff0375aec8c158e6f909569b873d31
(cherry picked from commit 7589e961a7)
2015-10-16 14:46:46 -07:00
Tao Bao 543b28d42f Merge "Pass source's info_dict to vendor's releasetools.py." 2015-10-16 21:42:34 +00:00
Ying Wang 08785f116b am 19fcc054: am 19e4741d: Merge "Use direct dependency on the JNI so files."
* commit '19fcc054bd489799408691bbb933ff2d6cea7a4a':
  Use direct dependency on the JNI so files.
2015-10-16 01:29:58 +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 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 04bb0eef90 am b56b2e9a: am 5baea143: Merge "Use libgcov OR libclang_rt.profile, not both."
* commit 'b56b2e9aa0df332699b39f0e020518413eeddee8':
  Use libgcov OR libclang_rt.profile, not both.
2015-10-15 18:53:55 +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
Ying Wang 7fffc3d0d0 am 5eb1f1fb: am f1b066b5: Merge "Remove duplicate local_time.default"
* commit '5eb1f1fbf1b62870a0c44088dd8046b7b87239dc':
  Remove duplicate local_time.default
2015-10-15 18:45:35 +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 31ba99b9e2 am a6968d8f: am 2af58637: Merge "Add the Product ID to target_files.zip"
* commit 'a6968d8f1db449ce84ec7c99f7c4e571d1abb289':
  Add the Product ID to target_files.zip
2015-10-15 18:27:46 +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 ee15a4527e am f14b0298: am 5c24a50e: Merge "generic_x86: delete system_server execmem"
* commit 'f14b0298f645b03a3f63587a678350741cca7e3d':
  generic_x86: delete system_server execmem
2015-10-15 09:50:56 +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 a80dfcb69b am cf58d1f5: am 7d3690eb: Merge "Export include path to D-Bus headers for multilib builds"
* commit 'cf58d1f5fed741836f6d06820dce5502e4770dd5':
  Export include path to D-Bus headers for multilib builds
2015-10-15 04:15:11 +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 8c6af7ba8f am ef67c196: am 84c5ae52: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit 'ef67c1963fa7fec143d53f0e63792d80445f781c':
  Use @arg-lsit-file for jar in add-carried-jack-resources
2015-10-15 01:21:28 +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
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 927f00d469 am 5b7aaeaa: am ed4b0eeb: Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""
* commit '5b7aaeaa2e71cac30609263364082f33ce43bfbf':
  Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
2015-10-14 23:40:46 +00: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 ee299938bf am 5d012538: am 37572684: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '5d012538fbebf44a97539e0430f7190c016d2a4c':
  Use @arg-lsit-file for jar in add-carried-jack-resources
2015-10-14 21:56:38 +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 b568c7a8fa am 99fe0556: am f635a586: Merge "Disable verity metadata for eng builds"
* commit '99fe05567b5a76d2b3379ee91e9941272cb67219':
  Disable verity metadata for eng builds
2015-10-14 20:58:12 +00:00