Commit graph

23891 commits

Author SHA1 Message Date
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
d94525ca52 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:51:34 +00: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
5d3e2da94f 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 11:58:47 +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
49801ef8c2 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 11:38:23 +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
e9c462b00a 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:18:59 +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
c607474ec2 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:18 +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
e7733e55f6 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:06:06 +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
Dirk Dougherty
0b9e204df0 Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
Change-Id: I460a5cb43e4be6ff552a7b2d41b6d3957f2d02a2
2015-07-02 14:21:55 -07:00
Chris Elliott
1e253e76b9 Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev 2015-07-02 20:18:35 +00:00
Tao Bao
4dacce92ce DO NOT MERGE Fix the syntax error in the edify script generator
file_getprop() always expects two arguments.

Bug: 19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
2015-07-02 13:17:21 -07:00
Elliott Hughes
b661c37f4d am cd26a2dd: Merge "Remove HAVE_STDINT_H namespace pollution."
* commit 'cd26a2dd7e2be499c9eb8b3e907cb3d31b1ed5be':
  Remove HAVE_STDINT_H namespace pollution.
2015-07-02 18:58:41 +00:00
Elliott Hughes
cd26a2dd7e Merge "Remove HAVE_STDINT_H namespace pollution." 2015-07-02 18:50:26 +00:00
Stephen Hines
fc4930034f am b2275868: Merge "Add LOCAL_NO_LIBGCC."
* commit 'b2275868e15caef2a04f0530749cc06415ef10f6':
  Add LOCAL_NO_LIBGCC.
2015-07-02 18:45:45 +00:00
Stephen Hines
b2275868e1 Merge "Add LOCAL_NO_LIBGCC." 2015-07-02 18:38:32 +00:00
Ying Wang
75011b2003 Add LOCAL_NO_LIBGCC.
This can be used to compile independent libraries without the need for
libgcc.a.

Change-Id: I924200995569d9a978ddbaa6ec321d80734f1374
2015-07-02 11:05:27 -07:00
Elliott Hughes
d47e01a3a1 Remove HAVE_STDINT_H namespace pollution.
Change-Id: I1e42d1616da0f3a90f8da189d2e919f781c4eb5a
2015-07-02 10:26:53 -07:00
Ying Wang
91a38d07d0 am 68787b3d: am bbaeaa58: Merge "Configure synci generation explicitly"
* commit '68787b3d1e0b230f3fd812759be03736f73daaf4':
  Configure synci generation explicitly
2015-07-02 06:39:10 +00:00
Tao Bao
26c9a7a7f9 am 414b80e1: am 41bcf3e4: (-s ours) Fix build.
* commit '414b80e17e6e5c5f90ddd00131987f4a860b8d69':
  Fix build.
2015-07-02 03:52:34 +00:00
Tao Bao
414b80e17e am 41bcf3e4: (-s ours) Fix build.
* commit '41bcf3e425b9a1792b65b16b1c115b018348bde7':
  Fix build.
2015-07-02 03:28:43 +00:00
Tao Bao
41bcf3e425 Fix build.
Change-Id: Id3eb4821a3c3061063a00294bfa268693c773eb8
2015-07-01 19:38:34 -07:00
Tao Bao
4d19bf0fd1 am 94a52c36: am 608d9d24: (-s ours) am 1aa1af0e: sparse_img.py: Don\'t write empty map groups.
* commit '94a52c3609c04fa94027597ec29f6382a433594e':
  sparse_img.py: Don't write empty map groups.
2015-07-02 02:25:03 +00:00
Simon Wilson
83c0b2425a am 3ea36f4f: am e416a41f: (-s ours) am 16401ad4: Revert "sparse_img.py: Don\'t write empty map groups."
* commit '3ea36f4fd2861b4e0cc4424db69ab5714a876a9f':
  Revert "sparse_img.py: Don't write empty map groups."
2015-07-02 02:25:02 +00:00
Tao Bao
43bf14d27f am 8bd72025: resolved conflicts for merge of 8787cd6d to mnc-dev
* commit '8bd720257eeaf9bf28b2dc8a36b856ccc30b1e8c':
  sparse_img.py: Don't write empty map groups.
2015-07-02 02:18:36 +00:00
Tao Bao
94a52c3609 am 608d9d24: (-s ours) am 1aa1af0e: sparse_img.py: Don\'t write empty map groups.
* commit '608d9d2452ba547875691f4df7ba313239177395':
  sparse_img.py: Don't write empty map groups.
2015-07-02 02:14:36 +00:00
Simon Wilson
3ea36f4fd2 am e416a41f: (-s ours) am 16401ad4: Revert "sparse_img.py: Don\'t write empty map groups."
* commit 'e416a41f3ae1132c0eb53d78d3d6bc60f2f0d052':
  Revert "sparse_img.py: Don't write empty map groups."
2015-07-02 02:07:09 +00:00
Tao Bao
8bd720257e resolved conflicts for merge of 8787cd6d to mnc-dev
Change-Id: I19497d05a021c21c905b2bddd5b36d370dc2208f
2015-07-01 18:06:33 -07:00