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
b7f9703e44
am f08f5e37: am 44c8e4db: am 420f95ff: Merge "releasetools: Support packaging for system_root_image."
...
* commit 'f08f5e37f9cb73492dd33082c43087ee20f3856c':
releasetools: Support packaging for system_root_image.
2015-08-08 02:48:17 +00:00
Dan Willemsen
fe0bb57250
am 248a0ba0: am b8331622: am 46ed451d: Merge "build: Load makefiles in the same order with Make 4.0"
...
* commit '248a0ba02fe7d5bdfe4d3e741add0353a86e9e21':
build: Load makefiles in the same order with Make 4.0
2015-08-08 02:48:15 +00:00
Roozbeh Pournader
181649b2d0
Merge "Remove mention of EXTENDED_FONT_FOOTPRINT."
2015-08-08 01:13:49 +00:00
Tao Bao
f08f5e37f9
am 44c8e4db: am 420f95ff: Merge "releasetools: Support packaging for system_root_image."
...
* commit '44c8e4db55707bb67e06ccc0db3f42a8c7a9bb1e':
releasetools: Support packaging for system_root_image.
2015-08-07 20:08:08 +00:00
Dan Willemsen
248a0ba02f
am b8331622: am 46ed451d: Merge "build: Load makefiles in the same order with Make 4.0"
...
* commit 'b8331622962be9d044eedce0aa1dff33ca1c5b16':
build: Load makefiles in the same order with Make 4.0
2015-08-07 20:08:00 +00:00
Furquan Shaikh
e8c212235f
vboot_signer: Add kernel subkey required for signing kernel keyblock
...
Currently, the keyblock was being generated using
data_key.vbprivk. However, we need to use kernel_subkey.vbprivk for
kernel keyblock generation. This did not create any issues until now
because dev-mode just throws a message saying that keyblock is
invalid. But, normal-mode does not boot if keyblock is
invalid. Add extra parameter for passing in kernel subkey to
vboot_signer script.
TEST="make bootimage-nodeps" generates correctly signed
boot.img. Verified that the image boots fine in normal mode.
Change-Id: I0fc2183b466e34ddf1d98c9532072548504fcec4
Signed-off-by: Furquan Shaikh <furquan@google.com>
2015-08-07 12:01:20 -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
Yusuf Ozuysal
c408949f01
am 4c71ac43: am 734dadd8: am cd90b3cd: am b1014924: am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev
...
* commit '4c71ac43179cb7330e6f0702e96b9fdffef6245f':
Add support-customtabs to the doc build.
2015-08-07 00:49:28 +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
Yusuf Ozuysal
4c71ac4317
am 734dadd8: am cd90b3cd: am b1014924: am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev
...
* commit '734dadd8b1cfc009b4633eeb89487e7e6b3691a0':
Add support-customtabs to the doc build.
2015-08-07 00:42:01 +00:00
Yusuf Ozuysal
734dadd8b1
am cd90b3cd: am b1014924: am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev
...
* commit 'cd90b3cd296559cb1c846bceb1598cf6a8640225':
Add support-customtabs to the doc build.
2015-08-07 00:35:04 +00:00
Yusuf Ozuysal
cd90b3cd29
am b1014924: am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev
...
* commit 'b1014924b70be4b169877c29e60b9a15b74cd647':
Add support-customtabs to the doc build.
2015-08-07 00:27:20 +00:00
Yusuf Ozuysal
b1014924b7
am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev
...
* commit '736463f86cbe4a5d6b1b9333ee0eab4f9ebd5a70':
Add support-customtabs to the doc build.
2015-08-07 00:20:36 +00:00
Yusuf Ozuysal
736463f86c
Merge "Add support-customtabs to the doc build." into mnc-dev
2015-08-07 00:10:39 +00:00
Roozbeh Pournader
315890973d
Remove mention of EXTENDED_FONT_FOOTPRINT.
...
This has been a null operation for a while, as devices are on the
extended font footprint by default.
Bug: 21785576
Change-Id: I884752876fa529b9ff29b14d08b0e9e618fa7348
2015-08-06 16:45:30 -07: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
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
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
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