Gilad Arnold
cb9dd015ab
am 0b2fab80: am 5070204e: am 7b49da7e: Merge "Remove LOCAL_MODULE from generated DBus header path."
...
* commit '0b2fab808754e36c89a40e4d5a646d6774dbfc08':
Remove LOCAL_MODULE from generated DBus header path.
2015-08-06 22:17:38 +00:00
Gilad Arnold
0b2fab8087
am 5070204e: am 7b49da7e: Merge "Remove LOCAL_MODULE from generated DBus header path."
...
* commit '5070204e117d5a20f06fa337c652e36884f29d86':
Remove LOCAL_MODULE from generated DBus header path.
2015-08-06 22:10:49 +00: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
e62267206a
am e8966296: am 100422b2: am 2e4b90e5: Merge "Dedup system shared libraries."
...
* commit 'e8966296b7bcf051872c48aa6220043d2709da87':
Dedup system shared libraries.
2015-08-06 21:51:59 +00:00
Dan Albert
e5296981dc
am 71ca6afb: am 849bf820: am 735cd90d: Merge "Disable transitive symbol resolving for mips64."
...
* commit '71ca6afbde51cb989424ea3fdd3f5dfa0c8f1ac9':
Disable transitive symbol resolving for mips64.
2015-08-06 21:51:58 +00:00
Dan Albert
e8966296b7
am 100422b2: am 2e4b90e5: Merge "Dedup system shared libraries."
...
* commit '100422b2311a96fbbdb1ba62a9945c2637c9e861':
Dedup system shared libraries.
2015-08-06 21:40:51 +00:00
Dan Albert
71ca6afbde
am 849bf820: am 735cd90d: Merge "Disable transitive symbol resolving for mips64."
...
* commit '849bf82079ea33b84c7c01fbc2e52205843720ed':
Disable transitive symbol resolving for mips64.
2015-08-06 21:40:50 +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
9d49568900
am 7c6a2a4c: resolved conflicts for merge of 610520ad
to mnc-dr-dev-plus-aosp
...
* commit '7c6a2a4ccf30ce74a5acddec406fdf4243da1e50':
build: Support packaging for system_root_image.
2015-08-06 18:07:42 +00:00
Ying Wang
1c79b73b69
am 479de877: am a101f558: am ecbc5b40: Merge "Build static ckati on Linux."
...
* commit '479de8779ef74c0976f81cba00492aa17cfb6c36':
Build static ckati on Linux.
2015-08-06 18:02:38 +00:00
Tao Bao
7c6a2a4ccf
resolved conflicts for merge of 610520ad
to mnc-dr-dev-plus-aosp
...
Change-Id: If44e033d2163b1e357be78b5a9e1b6092baf5063
2015-08-06 11:01:31 -07:00
Ying Wang
479de8779e
am a101f558: am ecbc5b40: Merge "Build static ckati on Linux."
...
* commit 'a101f55893ecaa59666faa653a926ea49d57212a':
Build static ckati on Linux.
2015-08-06 17:55:13 +00: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
Christopher Wiley
fe4f4de105
am 422e972b: resolved conflicts for merge of 7d1be400
to mnc-dr-dev-plus-aosp
...
* commit '422e972b0548a7f3d2b76e6a5ec9dd77c05283cb':
Add build rules to generate native DBus interfaces
2015-08-05 20:35:50 +00:00
Christopher Wiley
422e972b05
resolved conflicts for merge of 7d1be400
to mnc-dr-dev-plus-aosp
...
Change-Id: I2c62de9beb50ea1661b114a9d02b11ba73a28d82
2015-08-05 10:20:42 -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
ae61c885c6
am 450c53ac: am fa977ff3: am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider"
...
* commit '450c53ace6a8c61f0fdf2058307b5e04db617f49':
Replace Browser with Browser2 and BookmarkProvider
2015-08-04 23:43:29 +00:00
Paul Miller
450c53ace6
am fa977ff3: am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider"
...
* commit 'fa977ff366f54c6ae244f3ba99e3481f7d29796d':
Replace Browser with Browser2 and BookmarkProvider
2015-08-04 23:35:33 +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
82407825c3
am d2d30242: am bd555f15: resolved conflicts for merge of d86f39ca
to stage-aosp-master
...
* commit 'd2d3024292278a0a0723c901bee71c362735d6b1':
Ignore .*.java files when collecting .java files.
2015-08-04 20:55:15 +00:00
Ying Wang
d2d3024292
am bd555f15: resolved conflicts for merge of d86f39ca
to stage-aosp-master
...
* commit 'bd555f1523ec3faafe1e3c6cefce9fe0c96090c1':
Ignore .*.java files when collecting .java files.
2015-08-04 20:42:56 +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
082b8ecb7b
am f2ee86d1: am 5c78a488: am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build."
...
* commit 'f2ee86d1712edf1c5b1b5b920883b037c661ab4f':
Fix writing clean_steps.mk in the first build.
2015-08-04 19:37:08 +00:00
Ying Wang
f2ee86d171
am 5c78a488: am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build."
...
* commit '5c78a488d0b7d293c254493a9fc5fc71bc50b011':
Fix writing clean_steps.mk in the first build.
2015-08-04 19:28:00 +00: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
23d8c546cc
am cf3a0c52: am 32350fc5: am 5c3adca4: Merge "Don\'t prepend CC_WRAPPER to CLANG."
...
* commit 'cf3a0c52acc2e431294b927bc8923677f807794c':
Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:54:49 +00:00
Ying Wang
27c9e3ea48
am dc6d2ada: am 60df3444: am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
...
* commit 'dc6d2adaa851386ee01036db9a00912bd29a5115':
Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:54:48 +00:00
Ying Wang
cf3a0c52ac
am 32350fc5: am 5c3adca4: Merge "Don\'t prepend CC_WRAPPER to CLANG."
...
* commit '32350fc547569de75045171eb37e7feac16e93fd':
Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:47:26 +00:00
Ying Wang
dc6d2adaa8
am 60df3444: am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
...
* commit '60df344458f75ed9100e03f6012a73daf52d0807':
Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:45:41 +00:00
Ying Wang
60df344458
am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
...
* commit '0247fe72c05eb27ffb20f14d4b05458bb8641a38':
Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:36:32 +00:00
Ying Wang
0247fe72c0
am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
...
* commit '16d0b4cff1b643ee6bb70a3cf4541f34c4bc2210':
Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:28:49 +00:00
Ying Wang
16d0b4cff1
am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.
...
* commit '66c8e8c756fb1790cac792b32ba2de057c3b1b4e':
Don't prepend CC_WRAPPER to CLANG.
2015-08-03 21:20:54 +00:00