Colin Cross
bf2f0c729b
am a1ac4736
: am b110da5f
: am 9d8854e3
: Merge "build: delete 64-bit blacklist"
...
* commit 'a1ac47367636c0473156679f8f30af626df7da85':
build: delete 64-bit blacklist
2014-06-18 21:40:27 +00:00
Ying Wang
69c27d9ad9
am 88440c53
: am 5d88b3d7
: am c4262982
: Merge "Use the correct MKBOOTIMG."
...
* commit '88440c536ba0cfdd42e88378c952eb56f918f4a8':
Use the correct MKBOOTIMG.
2014-06-18 21:09:30 +00:00
Colin Cross
a1ac473676
am b110da5f
: am 9d8854e3
: Merge "build: delete 64-bit blacklist"
...
* commit 'b110da5f2bf9cf105dd675648075d13c942d1892':
build: delete 64-bit blacklist
2014-06-18 20:24:56 +00:00
Ying Wang
88440c536b
am 5d88b3d7
: am c4262982
: Merge "Use the correct MKBOOTIMG."
...
* commit '5d88b3d7d615995c6b1909992347fe0b5692492e':
Use the correct MKBOOTIMG.
2014-06-18 18:41:01 +00:00
Deepanshu Gupta
849cf47483
am aaa502bc
: am e662adf7
: am 2a7f1c59
: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
...
* commit 'aaa502bc9ee796c4121cc275834f083b85b4e71e':
Integrate build_font.py [DO NOT MERGE]
2014-06-18 00:25:30 +00:00
Deepanshu Gupta
aaa502bc9e
am e662adf7
: am 2a7f1c59
: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
...
* commit 'e662adf748be5d8df6056f4cf5da2c821bc27c59':
Integrate build_font.py [DO NOT MERGE]
2014-06-18 00:15:39 +00:00
Deepanshu Gupta
e662adf748
am 2a7f1c59
: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
...
* commit '2a7f1c59300ee462b63e3065f65f24291ca78043':
Integrate build_font.py [DO NOT MERGE]
2014-06-18 00:10:39 +00:00
Brian Carlstrom
a44f9a35a2
am edbc4595
: am d51730a6
: Merge "Help catch common 32/64-bit errors."
...
* commit 'edbc4595b817aef5f620e78dc283d8cc8fccff2a':
Help catch common 32/64-bit errors.
2014-06-17 23:34:52 +00:00
Colin Cross
9d8854e30c
Merge "build: delete 64-bit blacklist"
2014-06-17 21:42:00 +00:00
Colin Cross
ae2986e51a
build: delete 64-bit blacklist
...
The last projects in the blacklist have been fixed, delete the code.
Change-Id: I0fe7809bd18e32516374c9cb2a6f71df1d3c62ee
2014-06-17 21:35:44 -07:00
Ying Wang
42c9804331
Use the correct MKBOOTIMG.
...
Change-Id: I7450a85770cc8de2ea313570999a7d7076e950d2
2014-06-18 11:31:21 -07:00
Brian Carlstrom
338d1e7f33
Help catch common 32/64-bit errors.
...
(cherry picked from commit cf5ea762e015bc044d251814d9062ef1df4dd49f)
Change-Id: I43eb93d41967c63acb0723083c0178019f1364d0
2014-06-17 15:23:49 -07:00
JP Abgrall
55f786e7ad
Merge "core+tools: support specifying F2FS as the fstype for userdata"
2014-06-17 20:55:27 +00:00
Xavier Ducrohet
8566651d98
am e87fcf5e
: Revert "Add missing support lib to list."
...
* commit 'e87fcf5e16f906353f6a62f002a1bd1f8cda5e67':
Revert "Add missing support lib to list."
2014-06-18 00:38:06 +00:00
Xavier Ducrohet
e87fcf5e16
Revert "Add missing support lib to list."
...
This reverts commit b3ae5354c3
.
2014-06-17 17:25:18 -07:00
Brian Carlstrom
3bd5abb4f9
am a44f9a35
: am edbc4595
: am d51730a6
: Merge "Help catch common 32/64-bit errors."
...
* commit 'a44f9a35a284c600616a7f2213a861ecdefd5615':
Help catch common 32/64-bit errors.
2014-06-17 23:38:48 +00:00
Deepanshu Gupta
2a7f1c5930
Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
2014-06-17 20:49:29 +00:00
JP Abgrall
5bfed5a320
core+tools: support specifying F2FS as the fstype for userdata
...
- Support TARGET_USERIMAGES_USE_F2FS.
- Support BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE.
- Support "userdata_fs_type" in the prop dict.
- Update build_image to recognize f2fs and call the correct command.
Change-Id: If31cc8bd235f93a4c7814fab36e6e2d13d3037ad
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-17 13:32:14 -07:00
Xavier Ducrohet
b8b0302eea
am b3ae5354
: Add missing support lib to list.
...
* commit 'b3ae5354c36a6ab850a1fca34470a93481a5831c':
Add missing support lib to list.
2014-06-17 19:26:28 +00:00
Xavier Ducrohet
b3ae5354c3
Add missing support lib to list.
...
Change-Id: I6f3f1d1526db9bd76a35a612bc44918deee3e305
2014-06-17 12:12:50 -07:00
Narayan Kamath
b60ccd6672
am ae65e2eb
: am d73ec26a
: Merge "Make default 64-bit primary, 32-bit secondary"
...
* commit 'ae65e2eb8d5f530d4292a5c70bac113f18900e9d':
Make default 64-bit primary, 32-bit secondary
2014-06-17 10:05:13 +00:00
Ying Wang
f864d502ab
Less spammy ProGuard.
...
Change-Id: I465921b878c4ed6ec5d564704801e435d1aaa63c
2014-06-17 11:53:31 -07:00
Narayan Kamath
d73ec26a19
Merge "Make default 64-bit primary, 32-bit secondary"
2014-06-17 04:39:21 +00:00
Brian Carlstrom
d795046319
Make default 64-bit primary, 32-bit secondary
...
Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5
2014-06-16 23:59:43 -07:00
Doug Zongker
3fd79a352e
Merge "full support for OTA of vendor partitions"
2014-06-17 03:47:23 +00:00
Narayan Kamath
9d62dbc532
resolved conflicts for merge of b60ccd66
to master
...
Change-Id: I731af090c472d70a6c0627cef87239dc6df91645
2014-06-17 11:11:35 +01:00
Ying Wang
cc033aba81
am fe86a7c1
: am a530bd40
: Merge "Also include the binaries for the 2nd arch."
...
* commit 'fe86a7c1531ac85d634b7fde16ce008ca28118fb':
Also include the binaries for the 2nd arch.
2014-06-16 23:53:39 +00:00
Ying Wang
d0052bc70a
am e6b3692b
: am c17e0f92
: Merge "Explicit record the modules\' built-file:installed-file"
...
* commit 'e6b3692b8357b52b0a67e12be450e1ccfda5ffb5':
Explicit record the modules' built-file:installed-file
2014-06-16 23:53:38 +00:00
Ying Wang
696af13a67
am a307bbc7
: am fcb077ea
: Merge "Put modules with install path to system/ to DATA/ in the zip file."
...
* commit 'a307bbc7dcc8ce533743ba829039de1f3f979beb':
Put modules with install path to system/ to DATA/ in the zip file.
2014-06-16 23:53:37 +00:00
Ying Wang
c947b4a8ae
Also include the binaries for the 2nd arch.
...
Also include the binaries for the 2nd arch when building module
packages.
Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6
2014-06-16 16:34:40 -07:00
Doug Zongker
c8b4e849f1
full support for OTA of vendor partitions
...
Make vendor partition a first-class member of the OTA system (for
target_files that contain a VENDOR/ subdirectory).
Build vendor images in a way that is compatible with block-based OTA.
Support updating the vendor partition in both full and incremental,
block and file OTAs. In most cases this is handled by refactoring the
existing code to handle the system partition to handle either, and
then calling it twice.
Currently we don't support incremental OTAs from a target-files
without a VENDOR subdirectory to one with one, or vice versa. To add
or remove a vendor partition a full OTA will need to be done.
Bug: 15544685
Change-Id: I9cb9a1267060bd9683a9bea19b43a26b5a43800d
2014-06-16 15:39:54 -07:00
Elliott Hughes
53caaaf6f8
am 0f41ad79
: am 1ffda9be
: Merge "Remove unused hosts."
...
* commit '0f41ad79932bf7e69d3bfab73f8ecf3c28956727':
Remove unused hosts.
2014-06-16 22:23:27 +00:00
Ying Wang
c17e0f92c5
Merge "Explicit record the modules' built-file:installed-file"
2014-06-16 22:13:20 +00:00
Ying Wang
74c9850c79
Explicit record the modules' built-file:installed-file
...
- This simplifies the logic to get the mapping of built-file to
installed-file. Previously we used file suffix matching which is error
prone and not scalable.
- With this change the .odex files will be included automatically.
Bug: 13585955
Change-Id: I4599abf93b9d501bac7aca7758d7f3aee21b3e36
2014-06-16 16:41:48 -07:00
Ying Wang
03270b97ca
Put modules with install path to system/ to DATA/ in the zip file.
...
Change-Id: I3948c28bb3f988d57da41d6eb8f97da4e20b0e86
2014-06-16 16:41:23 -07:00
JP Abgrall
a6e63c2e87
Merge "core: Fixup assert-max-image-size/assert-max-file-size usage"
2014-06-16 21:50:51 +00:00
Ying Wang
d64f3c6ee6
am c947b4a8
: Also include the binaries for the 2nd arch.
...
* commit 'c947b4a8aec947f4dd6177e3bbd692a144b0a60c':
Also include the binaries for the 2nd arch.
2014-06-16 23:42:56 +00:00
Elliott Hughes
7ec725d41f
resolved conflicts for merge of 53caaaf6
to master
...
Change-Id: I20d265364b09c64d3637e57f500e934ee2310887
2014-06-16 15:34:25 -07:00
JP Abgrall
0ed7cec97a
core: Fixup assert-max-image-size/assert-max-file-size usage
...
- Remove the incorrectly used (and unused) 3rd arg to assert-max-image-size
- Remove test for fstype in assert-max-file-size() as it was always
set to a value leading to 0.
Change-Id: I0a1182fcc85c6c3801d45731e691b9bb38657606
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-16 14:20:40 -07:00
Elliott Hughes
bfe62fc30c
Remove unused hosts.
...
Nobody is using freebsd-x86 or linux-ppc.
Change-Id: I4e19fd32d92b39ad574001e7046e37ccd2300a2e
2014-06-16 14:48:59 -07:00
Ying Wang
4d386c8e04
am 13a476c4
: am 2f1f30a9
: Merge "Trim down BUILD_FINGERPRINT."
...
* commit '13a476c40c0354220829efe29224845da78b6326':
Trim down BUILD_FINGERPRINT.
2014-06-16 16:33:45 +00:00
Ying Wang
fcb077ea01
Merge "Put modules with install path to system/ to DATA/ in the zip file."
2014-06-16 15:49:03 +00:00
Ying Wang
a530bd4025
Merge "Also include the binaries for the 2nd arch."
2014-06-16 15:40:29 +00:00
Ying Wang
ec45d37242
Also include the binaries for the 2nd arch.
...
Also include the binaries for the 2nd arch when building module
packages.
Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6
2014-06-16 16:42:10 -07:00
Ying Wang
5181a36bce
Trim down BUILD_FINGERPRINT.
...
Bug: 15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f
2014-06-13 18:02:44 -07:00
Wink Saville
2d5486a006
Merge "Merge kwd to master"
2014-06-13 21:09:46 +00:00
Elliott Hughes
fd40d060d9
am 7f880d15
: am 553c289a
: am 624220c1
: Merge "Remove useless stuff from "AndroidConfig.h"."
...
* commit '7f880d15da4c73889833087161e4c05b55ef07fe':
Remove useless stuff from "AndroidConfig.h".
2014-06-13 00:48:36 +00:00
Elliott Hughes
7f880d15da
am 553c289a
: am 624220c1
: Merge "Remove useless stuff from "AndroidConfig.h"."
...
* commit '553c289afdbdd774e689898df4e8246fdf68182e':
Remove useless stuff from "AndroidConfig.h".
2014-06-12 23:58:12 +00:00
Deepanshu Gupta
354ed641eb
Integrate build_font.py [DO NOT MERGE]
...
Execute the build_font.py script to rename the PS name of the fonts to
be shipped with the SDK.
Also edited the list of font directories to include in the build.
Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
(cherry picked from commit 887cd0c71e
)
2014-06-12 16:03:17 -07:00
Dianne Hackborn
dd0afa03f2
resolved conflicts for merge of 0c651756
to master
...
Change-Id: Ifd66a3daa792f88ac2db0c24a11962d445e8f22d
2014-06-12 11:34:48 -07:00