Thierry Strudel
74a81e6633
fix device specific fs_config on build server
...
fs_config function from libcutils, in order to properly set the xattr FS
used to define device specific uid, gid, permissions and capabilities,
now needs TARGET_OUT make variable to be passed explicitly to all tools
using it:
fs_config
fs_get_stats used by mktarball.sh
make_ext4fs used by mkuserimg.sh
mksquashfs used by mksquashfsimage.sh
Bug: 21989305
Bug: 22048934
Change-Id: I6caf9cf870882fce2ead93027767092c29b75ded
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2015-07-10 10:55:54 -07:00
Elliott Hughes
aeb45c6faf
am b211c8cf: am 76eaa968: Merge "Remove HAVE_WIN32_IPC."
...
* commit 'b211c8cf0994992f521f3406c3a173f64bf4fe0a':
Remove HAVE_WIN32_IPC.
2015-07-09 18:39:32 +00:00
Elliott Hughes
b211c8cf09
am 76eaa968: Merge "Remove HAVE_WIN32_IPC."
...
* commit '76eaa96875d5aac8d5141095e9e345a9ff84d814':
Remove HAVE_WIN32_IPC.
2015-07-09 17:50:52 +00:00
Elliott Hughes
76eaa96875
Merge "Remove HAVE_WIN32_IPC."
2015-07-09 17:30:16 +00:00
Elliott Hughes
ba2f676410
Remove HAVE_WIN32_IPC.
...
Change-Id: I6c01ed5b059c230d7382dc6158103f31d4bf9dbb
2015-07-09 10:20:13 -07:00
Elliott Hughes
da4c9d2fa5
am 9ba0796e: am 60dda9c4: Merge "Remove mkbootimg from the pathmap."
...
* commit '9ba0796e37f38b40eb2182c2d277a2b272169342':
Remove mkbootimg from the pathmap.
2015-07-08 23:39:23 +00:00
Elliott Hughes
5433b577ce
am 7a4a9296: am fd5692b3: Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h."
...
* commit '7a4a9296217932e78e9c7260167ac968ef86baf8':
Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.
2015-07-08 23:39:19 +00:00
Elliott Hughes
9ba0796e37
am 60dda9c4: Merge "Remove mkbootimg from the pathmap."
...
* commit '60dda9c44dfef577d8f95784c1554696882d83f7':
Remove mkbootimg from the pathmap.
2015-07-08 23:22:45 +00:00
Elliott Hughes
7a4a929621
am fd5692b3: Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h."
...
* commit 'fd5692b32c88306cfc800bdffb10a277d9cb080a':
Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.
2015-07-08 23:22:44 +00:00
Elliott Hughes
60dda9c44d
Merge "Remove mkbootimg from the pathmap."
2015-07-08 23:13:32 +00:00
Elliott Hughes
fd5692b32c
Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h."
2015-07-08 23:11:18 +00:00
Elliott Hughes
3d949bbabc
Remove mkbootimg from the pathmap.
...
It's only ever referred to directly. (Should probably move to
system/core/include, but that's orthogonal to this change.)
Change-Id: I353afff031a29206aaa5a0991fe0ccb39e4731e2
2015-07-08 16:05:17 -07:00
Elliott Hughes
b443d3a979
am a78f5557: am 8f548f35: Merge "Remove pathmap.mk entries for libc."
...
* commit 'a78f5557709ec7a2b9b1bf598b0b401a5b50e6ef':
Remove pathmap.mk entries for libc.
2015-07-08 21:49:07 +00:00
Elliott Hughes
a78f555770
am 8f548f35: Merge "Remove pathmap.mk entries for libc."
...
* commit '8f548f35d6c01c9dea76da885165e40aa10151f9':
Remove pathmap.mk entries for libc.
2015-07-08 21:34:53 +00:00
Elliott Hughes
8f548f35d6
Merge "Remove pathmap.mk entries for libc."
2015-07-08 21:19:59 +00:00
Elliott Hughes
b248bf85ae
Remove pathmap.mk entries for libc.
...
Change-Id: I9f4ce70696dd7df5922b3c80501fac9c7d4b7149
2015-07-08 14:10:23 -07:00
Elliott Hughes
5dbf4eab72
Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.
...
Change-Id: If1cd88ee14bf9cbb4a0a1f608b0d015c9181c2c2
2015-07-08 13:12:38 -07:00
Tao Bao
72935566aa
am 38a534b6: resolved conflicts for merge of 610754e5
to cw-e-dev
...
* commit '38a534b6939630039d0c78c2f9f20dd8fde64c85':
Scan all init.*.rc files for flash_recovery service.
2015-07-08 18:14:10 +00:00
Tao Bao
b8fbf8a2a1
am 74008203: am e246964b: Merge "Scan all init.*.rc files for flash_recovery service."
...
* commit '7400820330b39bc5d044c6f9c46d06a7650c83f1':
Scan all init.*.rc files for flash_recovery service.
2015-07-08 17:52:33 +00:00
Tao Bao
38a534b693
resolved conflicts for merge of 610754e5
to cw-e-dev
...
Change-Id: Ia0d0d82c7fec86e1585a9e2c90ac877c363ed491
2015-07-08 10:43:31 -07:00
Tao Bao
7400820330
am e246964b: Merge "Scan all init.*.rc files for flash_recovery service."
...
* commit 'e246964b8f73056015379ff37ff746f549c0f20d':
Scan all init.*.rc files for flash_recovery service.
2015-07-08 17:39:02 +00:00
Tao Bao
e246964b8f
Merge "Scan all init.*.rc files for flash_recovery service."
2015-07-08 17:22:36 +00:00
Tao Bao
9f0c8dfaf1
Scan all init.*.rc files for flash_recovery service.
...
Clockwork builds may rename init.rc to init.core.rc. Change the OTA
script to scan all init.*.rc files to determine the proper location for
install-recovery.sh.
Bug: 22128990
Change-Id: Icad3497d1663e074b938919b40fc239c84fbeb2b
(cherry picked from commit 610754e5ad
)
2015-07-08 10:20:39 -07:00
Dirk Dougherty
bb7d32ad48
am 26b3ec5a: am 0da02191: am aee6585c: Update js/css versions and add pt-br.
...
* commit '26b3ec5a689f187b3174d1f774d40d879730b729':
Update js/css versions and add pt-br.
2015-07-08 12:55:32 +00:00
Dirk Dougherty
927d13d738
am bb18cb1a: am 4187cee6: am 0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
...
* commit 'bb18cb1a0ca335d9bb52bb7b589945a1027cc6cf':
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
2015-07-08 12:55:13 +00:00
Dirk Dougherty
26b3ec5a68
am 0da02191: am aee6585c: Update js/css versions and add pt-br.
...
* commit '0da02191ccc2030a3b4ac81500fdcabb72570049':
Update js/css versions and add pt-br.
2015-07-08 11:44:24 +00:00
Dirk Dougherty
0da02191cc
am aee6585c: Update js/css versions and add pt-br.
...
* commit 'aee6585c3237b11f33b83e9dd96d93449e3e2259':
Update js/css versions and add pt-br.
2015-07-08 11:29:45 +00:00
Dirk Dougherty
bb18cb1a0c
am 4187cee6: am 0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
...
* commit '4187cee61b234a135ae2a62c876681a92e911893':
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
2015-07-08 11:21:57 +00:00
Dirk Dougherty
aee6585c32
Update js/css versions and add pt-br.
...
Change-Id: I0c5f8c8a3c77283e7f53d1c241d09aa39bca4292
2015-07-08 04:12:19 -07:00
Dirk Dougherty
4187cee61b
am 0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
...
* commit '0b9e204df09d9630db24f61bb427110501df6743':
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
2015-07-08 11:06:54 +00:00
Tao Bao
610754e5ad
Scan all init.*.rc files for flash_recovery service.
...
Clockwork builds may rename init.rc to init.core.rc. Change the OTA
script to scan all init.*.rc files to determine the proper location for
install-recovery.sh.
Bug: 22128990
Change-Id: If96bd0b81090683ad0bbfddb735d390204849d9f
2015-07-07 20:52:01 -07:00
Tao Bao
dc48635b16
am 1747e35a: am a0021026: Merge "fix up ota_from_target_files symlink detection."
...
* commit '1747e35a090cff66b117128c7bffd2e8b5050f37':
fix up ota_from_target_files symlink detection.
2015-07-07 17:17:57 +00:00
Tao Bao
1747e35a09
am a0021026: Merge "fix up ota_from_target_files symlink detection."
...
* commit 'a00210263efdce91c8035e34e062c67e8828c4a5':
fix up ota_from_target_files symlink detection.
2015-07-07 17:02:47 +00:00
Tao Bao
a00210263e
Merge "fix up ota_from_target_files symlink detection."
2015-07-07 16:48:51 +00:00
Ying Wang
2ffb3147bc
fix up ota_from_target_files symlink detection.
...
Change-Id: I10b668096d4e61e75473dd805f96387049f29b79
2015-07-06 14:02:01 -07:00
Tao Bao
9b1a9ec53f
am 11d4406e: am 48a27bcb: Merge "Fix OTA scripts to generate incremental BBOTA with OEM property."
...
* commit '11d4406eb9796819baeafda3142b16f9cc63d532':
Fix OTA scripts to generate incremental BBOTA with OEM property.
2015-07-06 16:49:06 +00:00
dcashman
2a50b9b006
am 2a3a2dc3: Merge "Allow init to create /mnt/sdcard symlink." into mnc-dev
...
* commit '2a3a2dc33c7e5cbd9da95ece2eec0c100e9fbc14':
Allow init to create /mnt/sdcard symlink.
2015-07-06 16:41:43 +00:00
Tao Bao
11d4406eb9
am 48a27bcb: Merge "Fix OTA scripts to generate incremental BBOTA with OEM property."
...
* commit '48a27bcbb15774d0360fa344420a53cc72cd6708':
Fix OTA scripts to generate incremental BBOTA with OEM property.
2015-07-06 16:40:49 +00:00
Tao Bao
48a27bcbb1
Merge "Fix OTA scripts to generate incremental BBOTA with OEM property."
2015-07-06 16:31:51 +00:00
dcashman
2a3a2dc33c
Merge "Allow init to create /mnt/sdcard symlink." into mnc-dev
2015-07-06 15:51:07 +00:00
Tao Bao
3806c231a9
Fix OTA scripts to generate incremental BBOTA with OEM property.
...
Bug: 21803136
Change-Id: I3a45e8aea0b4f4f4f2acb4c9c8a7fad7a014680c
2015-07-05 21:08:33 -07:00
Ying Wang
1f59fcb23d
am 8f908ade: am 2e26f896: Merge "Simplify LOCAL_NO_CRT."
...
* commit '8f908ade58fd21d5bb27b7a42f8f07553c237df6':
Simplify LOCAL_NO_CRT.
2015-07-04 02:58:23 +00:00
Elliott Hughes
a02bca2e7a
am b661c37f: am cd26a2dd: Merge "Remove HAVE_STDINT_H namespace pollution."
...
* commit 'b661c37f4dad27b1917c99eac3220a2a4057565d':
Remove HAVE_STDINT_H namespace pollution.
2015-07-04 02:58:21 +00:00
Stephen Hines
8e75fb2acb
am fc493003: am b2275868: Merge "Add LOCAL_NO_LIBGCC."
...
* commit 'fc4930034fc2694decc264ba2d217ab60e50d182':
Add LOCAL_NO_LIBGCC.
2015-07-04 02:58:18 +00:00
Chris Elliott
80a863d02b
am a80307b8: am a0cca8e6: (-s ours) am 1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
...
* commit 'a80307b88efe12f5f604d9657ade824f83b69c20':
DO NOT MERGE Fix the syntax error in the edify script generator
2015-07-02 23:12:39 +00:00
Ying Wang
8f908ade58
am 2e26f896: Merge "Simplify LOCAL_NO_CRT."
...
* commit '2e26f896a65563f750f2d459d13cc8edfa705d95':
Simplify LOCAL_NO_CRT.
2015-07-02 23:06:54 +00:00
Ying Wang
2e26f896a6
Merge "Simplify LOCAL_NO_CRT."
2015-07-02 22:59:38 +00:00
Ying Wang
491fca9809
Simplify LOCAL_NO_CRT.
...
Change-Id: If2486e4861071df6b225fe7f387530a38f554484
2015-07-02 15:58:34 -07:00
Chris Elliott
a80307b88e
am a0cca8e6: (-s ours) am 1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
...
* commit 'a0cca8e66ac124c5d78fe35e10ece83c5314734b':
DO NOT MERGE Fix the syntax error in the edify script generator
2015-07-02 22:48:42 +00:00
Chris Elliott
a0cca8e66a
am 1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
...
* commit '1e253e76b9f0fcc92769b3dd02c8ffc8cc30520d':
DO NOT MERGE Fix the syntax error in the edify script generator
2015-07-02 22:36:55 +00:00