StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,107 Commits 1 Branch 0 Tags
0fed67301d698a30d3f593f6e6ad738f5b28d41e
Commit Graph

22107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao
0fed67301d am 8af98164: Merge "Change the cache partition size check into warnings." 
* commit '8af98164162e86cd61ccdcfb0f09744c58e02ac8':
  Change the cache partition size check into warnings.
 2015-08-08 04:32:46 +00:00
Tao Bao
8af9816416 Merge "Change the cache partition size check into warnings." 2015-08-08 04:26:57 +00:00
Tao Bao
575d68a48e Change the cache partition size check into warnings. 
For some old builds, we may not define cache partition size. Change the
exception into a warning to make the script backward compatible.

Change-Id: Ie94c7fbb1a9f3a7db3f16e8d845e493a534aac5b
 2015-08-07 19:49:45 -07:00
Tao Bao
44c8e4db55 am 420f95ff: Merge "releasetools: Support packaging for system_root_image." 
* commit '420f95ff5d0ccf9c41683760c1b2731f6be0667e':
  releasetools: Support packaging for system_root_image.
 2015-08-07 04:50:47 +00:00
Tao Bao
420f95ff5d Merge "releasetools: Support packaging for system_root_image." 2015-08-07 04:45:20 +00: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
40467cbfbb Merge "build: Support packaging for system_root_image." 2015-08-06 17:43:46 +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
Tao Bao
7a5bf8a645 releasetools: Support packaging for system_root_image. 
For system images that contain the root directory, we need to find the
root directory at ROOT/ instead of BOOT/RAMDISK/.

Change-Id: Ica345c8b1b03475f8ac6c44fd576045fcf17c882
 2015-08-05 16:28:55 -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
Paul Miller
fa977ff366 am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider" 
* commit '09185f5a8f943aeac3d6ace37a73870f5eedc6f4':
  Replace Browser with Browser2 and BookmarkProvider
 2015-08-04 23:26:56 +00:00
Paul Miller
09185f5a8f Merge "Replace Browser with Browser2 and BookmarkProvider" 2015-08-04 23:20:29 +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
fd43aa8a02 Merge "Fix writing clean_steps.mk in the first build." 2015-08-04 19:14:57 +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
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
5c3adca401 Merge "Don't prepend CC_WRAPPER to CLANG." 2015-08-03 21:13:37 +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
b139ae078c am 22354d3c: Merge "Add support for system images that contain the root directory" 
* commit '22354d3c496e2c21f873758d996878e68c2607bb':
  Add support for system images that contain the root directory
 2015-08-01 00:17:21 +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
22354d3c49 Merge "Add support for system images that contain the root directory" 2015-08-01 00:10:02 +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
Daniel Rosenberg
e6853b0d63 Add support for system images that contain the root directory 
When the root directory is included in system, the assumption that
system is mounted at /system breaks down. Redirect /system to /
in that case.

Change-Id: I8031b32d7cb9ca699c1cc22939e28afce9d1c847
 2015-07-31 16:52:21 -07:00
Daniel Rosenberg
59156a6b7d Add ro.build.system_root_image 
ro.build.system_root_image is true if the root directory is built
into the system image.

Change-Id: I17208ebd004c63aebb09db6c3e5f795619e73bd2
 2015-07-31 16:52:21 -07:00
Dan Albert
4982ef9d76 am 010f652e: Merge "Add system/core to the PYTHONPATH." 
* commit '010f652ee7a9398f46b1c635c6bd186f7c7f8853':
  Add system/core to the PYTHONPATH.
 2015-07-31 20:54:56 +00:00
Dan Albert
010f652ee7 Merge "Add system/core to the PYTHONPATH." 2015-07-31 20:48:17 +00:00