PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,693 Commits 1 Branch 0 Tags
6e14f4f1d16476e06ad46e270b94de959742717c
Commit Graph

1693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao 6e14f4f1d1 am 36ca3800: am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string." 
* commit '36ca3800bc5231972ecfde53d1241e715a98ad4e':
  updater: Clean up char* with std::string.
 2015-08-10 17:44:33 +00:00
Tao Bao 36ca3800bc am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string." 
* commit '7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace':
  updater: Clean up char* with std::string.
 2015-08-10 17:37:58 +00:00
Tao Bao 7f89389a0b am 7c511184: Merge "updater: Clean up char* with std::string." 
* commit '7c511184bf3ed44f3590027730a64d565c0e12ee':
  updater: Clean up char* with std::string.
 2015-08-10 17:29:54 +00:00
Tao Bao 7c511184bf Merge "updater: Clean up char* with std::string." 2015-08-10 17:23:13 +00:00
Dan Albert 07c8bb24df am f2a23a94: am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." 
* commit 'f2a23a94cb9649ad7888749a82976ce01988e0f9':
  Use CPPFLAGS instead of CFLAGS.
 2015-08-08 02:50:57 +00:00
Elliott Hughes 6f6a976191 am 2496489c: am a9390df6: am 06689dc5: Merge "Fix recovery image build." 
* commit '2496489cb4ec75f13b0d30f580332e74bf4a2fa8':
  Fix recovery image build.
 2015-08-08 02:48:47 +00:00
Dan Albert f2a23a94cb am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." 
* commit '236b3eb6a085bd0762849b5feca880f6dc63787d':
  Use CPPFLAGS instead of CFLAGS.
 2015-08-08 00:56:12 +00:00
Dan Albert 236b3eb6a0 am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." 
* commit 'e67104a6a778f70bd479e737b09eb32c835e250e':
  Use CPPFLAGS instead of CFLAGS.
 2015-08-08 00:51:16 +00:00
Dan Albert e67104a6a7 Merge "Use CPPFLAGS instead of CFLAGS." 2015-08-08 00:45:43 +00:00
Dan Albert b02e90f85c Use CPPFLAGS instead of CFLAGS. 
While we build these as C, to the build system they are technically
C++ and are subject to the global CPPFLAGS. Set LOCAL_CPPFLAGS here
instead of LOCAL_CFLAGS so we can be sure we override anything
provided by the build system.

Bug: http://b/23043421
Change-Id: I344b54ae4ff9f142365a42c33ba160c1be17a342
 2015-08-07 17:24:49 -07:00
Elliott Hughes 2496489cb4 am a9390df6: am 06689dc5: Merge "Fix recovery image build." 
* commit 'a9390df6c6b8d6cc98b102aeffc8e7acd300c857':
  Fix recovery image build.
 2015-08-07 21:13:05 +00:00
Elliott Hughes a9390df6c6 am 06689dc5: Merge "Fix recovery image build." 
* commit '06689dc53d14ab0449c64c097d2937179f986873':
  Fix recovery image build.
 2015-08-07 20:29:52 +00:00
Elliott Hughes 06689dc53d Merge "Fix recovery image build." 2015-08-07 20:24:21 +00:00
Elliott Hughes faa75006af Fix recovery image build. 
A recent adb cleanup changed the signature of adb_main.

Change-Id: I98d084f999966f1a7aa94c63e9ed996b3375096d
 2015-08-07 13:21:06 -07:00
Tao Bao e6aa3326c1 updater: Clean up char* with std::string. 
So we can remove a few free()s. And also replace a few pointers with
references.

Change-Id: I4b6332216704f4f9ea4a044b8d4bb7aa42a7ef26
 2015-08-06 13:05:00 -07:00
Tao Bao 40dfee777c am 68e77434: resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aosp 
* commit '68e77434d8967baf7f1a5b79a61febcc60e6cb0a':
  udpater: Call fsync() after rename().
 2015-08-04 21:39:54 +00:00
Tao Bao 68e77434d8 resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aosp 
Change-Id: Iba4d2e5c5c7d0e0c1088403ff32d8f0d12da925d
 2015-08-04 14:32:37 -07:00
Tao Bao 5aa3ce3aaa am be19dce8: udpater: Call fsync() after rename(). 
* commit 'be19dce86ce7d4a83f1cfcd11db393f8be8f4397':
  udpater: Call fsync() after rename().
 2015-08-04 21:01:11 +00:00
Tao Bao 2ecdc8948d am ddbfdf79: am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." 
* commit 'ddbfdf79518699b232837bae1052e70b701bd524':
  udpater: Call fsync() after rename().
 2015-08-04 18:49:36 +00:00
Tao Bao ddbfdf7951 am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." 
* commit '393d1e739fc10e526bd3b7b83836a266bfa24079':
  udpater: Call fsync() after rename().
 2015-08-04 18:42:12 +00:00
Tao Bao 393d1e739f am 27c1ab20: Merge "udpater: Call fsync() after rename()." 
* commit '27c1ab2095f25253d0920eb6afe7cd2791a708dc':
  udpater: Call fsync() after rename().
 2015-08-04 18:33:00 +00:00
Tao Bao be19dce86c udpater: Call fsync() after rename(). 
We need to ensure the renamed filename reaches the underlying storage.

Bug: 22840552
Change-Id: I824b6e9d8a9c5966035be7b42a73678d07376342
(cherry picked from commit dc3922622a)
 2015-08-04 11:28:12 -07:00
Tao Bao 27c1ab2095 Merge "udpater: Call fsync() after rename()." 2015-08-04 18:24:53 +00:00
Tao Bao dc3922622a udpater: Call fsync() after rename(). 
We need to ensure the renamed filename reaches the underlying storage.

Bug: 22840552
Change-Id: Ide2e753a2038691d472b6ee173cbf68ac998a084
 2015-08-03 21:35:05 -07:00
Tao Bao d9101adc4b am 414c576c: am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." 
* commit '414c576cf8fb5a8defef40d72f6c75012acdecab':
  recovery: Allow "Mount /system" for system_root_image.
 2015-08-01 15:52:44 +00:00
Tao Bao 414c576cf8 am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." 
* commit '2e979ef6fd21e1681a8ec7ca2f5582ca8e14ddcd':
  recovery: Allow "Mount /system" for system_root_image.
 2015-08-01 15:47:48 +00:00
Tao Bao 2e979ef6fd am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." 
* commit '302779e71cb1be68f60cb044c85436d4d6bcfecc':
  recovery: Allow "Mount /system" for system_root_image.
 2015-07-31 16:49:33 +00:00
Tao Bao 302779e71c Merge "recovery: Allow "Mount /system" for system_root_image." 2015-07-31 16:43:39 +00:00
Tao Bao abb8f7785e recovery: Allow "Mount /system" for system_root_image. 
When system images contain the root directory, there is no entry of
"/system" in the fstab. Change it to look for "/" instead if
ro.build.system_root_image is true. We actually mount the partition
to /system_root instead, and create a symlink to /system_root/system
for /system. This allows "adb shell" to work properly.

Bug: 22855115
Change-Id: Ibac493a5a9320c98ee3b60bd2cc635b925f5454a
 2015-07-30 17:22:29 -07:00
Tao Bao 14df07dd18 am 7d71725d: am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." 
* commit '7d71725d7667afa6b705fe0e20151e03d9db75d2':
  updater: Hoist fsync() to outer loop.
 2015-07-28 18:46:05 +00:00
Tao Bao 7d71725d76 am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." 
* commit '7666f65b2a1e4352c52df9fe7a0b26ce923a1477':
  updater: Hoist fsync() to outer loop.
 2015-07-28 00:34:59 +00:00
Tao Bao 7666f65b2a am 62e19231: Merge "updater: Hoist fsync() to outer loop." 
* commit '62e1923194de067c0ac589abcfc4f04fdddf2b1a':
  updater: Hoist fsync() to outer loop.
 2015-07-28 00:21:36 +00:00
Tao Bao 62e1923194 Merge "updater: Hoist fsync() to outer loop." 2015-07-28 00:12:31 +00:00
Tao Bao 187efff6f3 updater: Hoist fsync() to outer loop. 
Currently the fsync() inside write_all() may be called multiple times
when performing a command. Move that to the outer loop and call it
only after completing the command.

Also remove the O_SYNC flag when writing a stash.

Change-Id: I71e51d76051a2f7f504eef1aa585d2cb7a000d80
 2015-07-27 14:17:09 -07:00
Tao Bao 14c63c9567 am 4b3ad009: am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." 
* commit '4b3ad009f7a1dd0ac85d996d9f3a87a6a83b0e97':
  applypatch: Fix the checking in WriteToPartition().
 2015-07-25 01:21:43 +00:00
Tao Bao 4b3ad009f7 am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." 
* commit '0622ccb34d504170b76b8f4dd5f0639794be679a':
  applypatch: Fix the checking in WriteToPartition().
 2015-07-25 01:03:22 +00:00
Tao Bao 0622ccb34d am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." 
* commit '6a4a33e39ea2fa8626335f6b9cccf407c71c0588':
  applypatch: Fix the checking in WriteToPartition().
 2015-07-24 23:08:59 +00:00
Tao Bao 6a4a33e39e Merge "applypatch: Fix the checking in WriteToPartition()." 2015-07-24 22:56:36 +00:00
Tao Bao 1ce7a2a63d applypatch: Fix the checking in WriteToPartition(). 
WriteToPartition() should consider a target name as valid if it contains
multiple colons. But only the first two fields will be used.

Bug: 22725128
Change-Id: Ie9404375e24045c115595eec6ce5b6423da8fc3e
 2015-07-24 15:33:35 -07:00
Tao Bao 65b0c8891f am 6a06034d: am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." 
* commit '6a06034d031464b220bc78bda2654f80d6ef1ad1':
  applypatch: Support flash mode.
 2015-07-24 21:27:04 +00:00
Tao Bao 6a06034d03 am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." 
* commit '3b753ad5da2ade45548f95b4a76219db3043db49':
  applypatch: Support flash mode.
 2015-07-24 21:10:46 +00:00
Tao Bao 8749d238bf am e657f0fb: am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." 
* commit 'e657f0fb8ec21b09831ed19d18ba05a7630a4fb0':
  uncrypt: Support file level encryption.
 2015-07-24 20:33:22 +00:00
Tao Bao a6b3c540ad am 3f640620: am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." 
* commit '3f6406204c9886ee59209a98e1bb8b64ae615656':
  updater: libapplypatch needs libbase now.
 2015-07-24 20:33:21 +00:00
Tao Bao 990c308ab5 resolved conflicts for merge of 49a24460 to master 2015-07-24 13:29:09 -07:00
Tao Bao 82a4aa7f93 am 052796ea: am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++." 
* commit '052796ea09bcf33f7031aa8218628bf1c9ced02a':
  recovery: Switch fuse_* to C++.
 2015-07-24 20:06:54 +00:00
Tao Bao ef37ee0457 am 0d4e0026: recovery: Switch fuse_* to C++. 
* commit '0d4e002670064157aa34ba8c391184151b7d402a':
  recovery: Switch fuse_* to C++.
 2015-07-24 18:58:41 +00:00
Tao Bao 3b753ad5da am dd738c11: Merge "applypatch: Support flash mode." 
* commit 'dd738c11a49d594183dde9f0e46f56c7a575900a':
  applypatch: Support flash mode.
 2015-07-24 18:33:57 +00:00
Tao Bao e657f0fb8e am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." 
* commit 'c69095d8cd9685f9d9c7e3863a5e087efeadba3a':
  uncrypt: Support file level encryption.
 2015-07-24 18:33:22 +00:00
Tao Bao 3f6406204c am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." 
* commit '87f2c673dfbc310d1a80ea1c3b00d9e1adb1947f':
  updater: libapplypatch needs libbase now.
 2015-07-24 18:33:21 +00:00
Tao Bao 49a24460a4 am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." 
* commit '1dc71bec8d3dc3c1eb7eb40aed2eeb04b47f75ce':
  applypatch: Refactor strtok().
 2015-07-24 18:33:20 +00:00