Commit Graph

6664 Commits

Author SHA1 Message Date
Nick Kralevich c85364c9c9 am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
* commit '5f79bcdd070f4069cd60bbe68430ee172575f9e2':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
2015-08-12 23:53:50 +00:00
Nick Kralevich 5f79bcdd07 Merge changes from topic 'file_contexts.bin'
* changes:
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
2015-08-12 23:46:28 +00:00
Dan Willemsen b184ec2a82 am 608aa91d: Merge "Revert "Use repeatable timestamps""
* commit '608aa91db7ef1c131e2c49b0ffd39851ff2b6e9d':
  Revert "Use repeatable timestamps"
2015-08-12 01:07:44 +00:00
Dan Willemsen 608aa91db7 Merge "Revert "Use repeatable timestamps"" 2015-08-12 01:02:19 +00:00
Dan Willemsen 92026f2d36 Revert "Use repeatable timestamps"
OSX `date` doesn't understand -d

This reverts commit 13ba6e00f4.

Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
2015-08-12 01:00:19 +00:00
Dan Willemsen c576c08fd5 am 671b8ff5: Merge "Use repeatable timestamps"
* commit '671b8ff5457472631f805f3230273e5e8121b28a':
  Use repeatable timestamps
2015-08-12 00:55:21 +00:00
Dan Willemsen 671b8ff545 Merge "Use repeatable timestamps" 2015-08-12 00:49:26 +00:00
Dan Willemsen 13ba6e00f4 Use repeatable timestamps
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.

It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.

Bug: 23117013
Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
2015-08-11 17:08:03 -07:00
Ying Wang 23cb26c7bf am 20febe3d: Merge "Don\'t build otapackage on Mac."
* commit '20febe3d839131e2cde795ae2a36f93c5ac1c378':
  Don't build otapackage on Mac.
2015-08-11 23:14:52 +00:00
Ying Wang 20febe3d83 Merge "Don't build otapackage on Mac." 2015-08-11 22:49:25 +00:00
Ying Wang 09c4b68dfd Don't build otapackage on Mac.
Also removed the unneeded variable DISTTOOLS
and the unnecessary dependency of otapackage/updatepackage on DISTTOOLS.

Bug: 23085297
Change-Id: I6b269003a72bb48eda1260c8d9b4bd88974bcde9
2015-08-11 11:45:54 -07:00
Ying Wang a16556450c am edf7bf8d: Merge "Allow custom recovery resource dirs."
* commit 'edf7bf8d832fdd2356cb68519b8e717acde94e5b':
  Allow custom recovery resource dirs.
2015-08-10 22:23:10 +00:00
Ying Wang edf7bf8d83 Merge "Allow custom recovery resource dirs." 2015-08-10 22:15:23 +00:00
Dan Albert 96f480c93a am 4f20869b: Merge "Bump the default C++ standard up to C++14."
* commit '4f20869b1faa07ee0f615ee9087b91ef11e2d6e4':
  Bump the default C++ standard up to C++14.
2015-08-10 20:48:48 +00:00
Dan Albert c7d307d873 Bump the default C++ standard up to C++14.
This also drops the NDK default back to C++98 (or C++11 for code using
libc++). The platform NDK build should match the normal NDK build.

Bug: http://b/23043421
Change-Id: I3a336767ce271e84f4dfdebdadb3a98e5689def9
2015-08-10 13:37:42 -07:00
Ying Wang 9a17568624 Allow custom recovery resource dirs.
Set TARGET_PRIVATE_RES_DIRS in your BoardConfig.mk to specify custom
private recovery resource directories.
With this change you can share the same recovery resource dir for more
than one device; Also you can specify more than one directories.

Change-Id: Ieeb18f5ac11c98b6f08d0ab6fb4e0d9aa72b27e7
2015-08-10 11:33:10 -07:00
Dan Willemsen b833162296 am 46ed451d: Merge "build: Load makefiles in the same order with Make 4.0"
* commit '46ed451d12272edcb0ada9a8e0ec1f5f6e340ff8':
  build: Load makefiles in the same order with Make 4.0
2015-08-07 00:54:47 +00:00
Dan Willemsen 46ed451d12 Merge "build: Load makefiles in the same order with Make 4.0" 2015-08-07 00:47:51 +00:00
Dan Willemsen ec224d5072 build: Load makefiles in the same order with Make 4.0
Make 4.0 (and Kati) removed the implicit sort from the $(wildcard)
function. In order to ensure that makefiles are always loaded in the
same order, and an explicit sort.

This shouldn't matter, but some makefiles are modifying variables used
by siblings (LLVM_ROOT_PATH under frameworks/compile). In this case, the
path value still pointed to the same path, it just had extra '..'
references, and was enough to cause the binaries to be different.

Change-Id: Ief6551f999351ee2c193275aaae426dc064f8b34
2015-08-06 15:21:30 -07:00
Gilad Arnold 5070204e11 am 7b49da7e: Merge "Remove LOCAL_MODULE from generated DBus header path."
* commit '7b49da7e9a97f7064e275251957ed78dc5e38360':
  Remove LOCAL_MODULE from generated DBus header path.
2015-08-06 22:02:56 +00:00
Gilad Arnold 7b49da7e9a Merge "Remove LOCAL_MODULE from generated DBus header path." 2015-08-06 21:55:47 +00:00
Dan Albert 100422b231 am 2e4b90e5: Merge "Dedup system shared libraries."
* commit '2e4b90e5f152a964011bb621ee6112bee778d436':
  Dedup system shared libraries.
2015-08-06 21:34:24 +00:00
Dan Albert 849bf82079 am 735cd90d: Merge "Disable transitive symbol resolving for mips64."
* commit '735cd90d1762d10793bb52b0e0cf31f519e7af2b':
  Disable transitive symbol resolving for mips64.
2015-08-06 21:34:19 +00:00
Dan Albert 2e4b90e5f1 Merge "Dedup system shared libraries." 2015-08-06 21:25:45 +00:00
Dan Albert 735cd90d17 Merge "Disable transitive symbol resolving for mips64." 2015-08-06 21:25:38 +00:00
Dan Albert 7ba582aec3 Dedup system shared libraries.
These shouldn't differ by target. Right now only mips64 does, and
that's a bug.

Change-Id: Ic941ede85ba1bc07d3316a55639ba71a6afc9630
2015-08-06 14:18:55 -07:00
Dan Albert 46ed1e8590 Disable transitive symbol resolving for mips64.
The transitive symbol resolving causes build breakage when a binary
has indirect dependency on the NDK library.

This matches the change made for the the aarch64 toolchain:
https://android-review.googlesource.com/#/c/120654

Change-Id: Id5b2a63301cb1cdcdd84b4bcd9fbec8cf6ec0b3c
2015-08-06 14:18:55 -07:00
Gilad Arnold 54e92d0061 Remove LOCAL_MODULE from generated DBus header path.
Its presence requires #include directives to contain the build target
name, which is problematic because these directives can live in headers
that are shared by multiple build targets. Furthermore, having
LOCAL_MODULE in the generated header path is redundant because the
target directory is already private to the current build target (e.g.
.../<target_name>_intermediates/...).

Bug: 22608897
Change-Id: I059f71a1231e80f89c99441794a4491f2685036f
2015-08-06 12:50:23 -07:00
Tao Bao 610520ad20 am 40467cbf: Merge "build: Support packaging for system_root_image."
* commit '40467cbfbbc2a59d9b80f5c5ee97bd1a64bc2858':
  build: Support packaging for system_root_image.
2015-08-06 17:49:49 +00:00
Ying Wang a101f55893 am ecbc5b40: Merge "Build static ckati on Linux."
* commit 'ecbc5b401a55ab4e9e0e9cc9bf720044c4d4a829':
  Build static ckati on Linux.
2015-08-06 17:49:48 +00:00
Tao Bao 62bd479fdf build: Support packaging for system_root_image.
If system image contains the root directory
(BOARD_BUILD_SYSTEM_ROOT_IMAGE == "true"), we package the root directory
into ROOT/ instead of BOOT/RAMDISK/ in the target_files zip.

Change-Id: I817776ca97194991308b2131d0e34ab136283464
2015-08-05 16:39:39 -07:00
Ying Wang ecbc5b401a Merge "Build static ckati on Linux." 2015-08-05 16:43:59 +00:00
Christopher Wiley 7d1be40047 am 5923fcd0: Merge "Add build rules to generate native DBus interfaces"
* commit '5923fcd02131abfd1bc8f39704edc6c7e8100154':
  Add build rules to generate native DBus interfaces
2015-08-05 15:46:44 +00:00
Christopher Wiley 5923fcd021 Merge "Add build rules to generate native DBus interfaces" 2015-08-05 15:40:00 +00:00
Ying Wang bd555f1523 resolved conflicts for merge of d86f39ca to stage-aosp-master
Change-Id: Ifceb6705eeaaacc9f49788bc0e37a27e398beef0
2015-08-04 13:36:07 -07:00
Ying Wang d86f39cab7 Merge "Ignore .*.java files when collecting .java files." 2015-08-04 19:52:06 +00:00
Ying Wang 4aedea90e8 Ignore .*.java files when collecting .java files.
Bug: 22934689
Change-Id: I6c9cc8f37d09eb190946e596e5d1ba0c3b318088
2015-08-04 12:46:13 -07:00
Ying Wang 0a0e6eae3f Build static ckati on Linux.
Bug: 22798670
Change-Id: I3aaf127627c1c478ab3af2549e49506d4d1f19df
2015-08-04 12:23:27 -07:00
Ying Wang 5c78a488d0 am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build."
* commit 'fd43aa8a02d8415121694b4edd15ea8d549a7d3d':
  Fix writing clean_steps.mk in the first build.
2015-08-04 19:21:38 +00:00
Ying Wang eadaa954ce Fix writing clean_steps.mk in the first build.
Change-Id: Ieddc799f38e5d1522e329e8300bd9f49c26c70ae
2015-08-04 12:11:54 -07:00
Stephen Smalley d3a803e668 build: switch over to file_contexts.bin only
Change all uses of the file_contexts file to use the
file_contexts.bin file instead.

Depends on
   I75a781100082c23536f70ce3603f7de42408b5ba
   I43806d564b83d57f05f5c36c8eba7b1ff4831b04
   Id560d093440a2aba99cef28c20133b35feebf950
   I15660f4b3e4c5cb8ae0ec1498c74d6fcbb9a0400

Change-Id: Iaf8c4b2e420f610425a07f48db7af32bda3f5b3a
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-08-04 14:59:06 -04:00
Ying Wang 32350fc547 am 5c3adca4: Merge "Don\'t prepend CC_WRAPPER to CLANG."
* commit '5c3adca4011db8fd98a3b7beab76b5b02cbab063':
  Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:18:48 +00:00
Ying Wang 3e3d7b5ce5 Don't prepend CC_WRAPPER to CLANG.
We have deferred the CC_WRAPPER prepending to binary.mk per module.

Bug: 22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
(cherry-pick from commit 66c8e8c756)
2015-08-03 14:08:54 -07:00
Ying Wang ede3e31035 am 2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build."
* commit '2c0c1e56dbbaa3abf1d25796c94d6a31594b307e':
  Build 64-bit host tools in Linux/Mac SDK build.
2015-08-01 17:30:34 +00:00
Ying Wang 2c0c1e56db Merge "Build 64-bit host tools in Linux/Mac SDK build." 2015-08-01 17:23:20 +00:00
Daniel Rosenberg c26fddcc5b am e4fed421: Merge "build: core: Fix issue in recovery"
* commit 'e4fed421d5939469bf35cd6430300207a0ff4901':
  build: core: Fix issue in recovery
2015-08-01 00:17:22 +00:00
Daniel Rosenberg 545f226db0 am 46afd7f9: Merge "Add ro.build.system_root_image"
* commit '46afd7f981406e47740c46253aa16af1ab78eb9c':
  Add ro.build.system_root_image
2015-08-01 00:12:59 +00:00
Daniel Rosenberg e4fed421d5 Merge "build: core: Fix issue in recovery" 2015-08-01 00:10:09 +00:00
Daniel Rosenberg 46afd7f981 Merge "Add ro.build.system_root_image" 2015-08-01 00:05:05 +00:00
Daniel Rosenberg 7b82656984 build: core: Fix issue in recovery
Now that symlinks are created at build time, the rsync while
making recovery runs into issues around the etc symlink

Change-Id: Ie781507b22e4661629840075b274eaab2f712de6
2015-07-31 16:52:21 -07:00