Isaac Chen
47a95bb673
Merge "Fix audio policy configuration for generic targets" into oc-dev am: 34d8c95fd7
...
am: ea97912057
Change-Id: I0ebf242f841c9c778e943b1cc2d31598e906476a
2017-06-14 08:25:05 +00:00
Isaac Chen
ea97912057
Merge "Fix audio policy configuration for generic targets" into oc-dev
...
am: 34d8c95fd7
Change-Id: I1d5a39cec809f91477e09c8545c6d1173152ea0f
2017-06-14 08:22:36 +00:00
TreeHugger Robot
34d8c95fd7
Merge "Fix audio policy configuration for generic targets" into oc-dev
2017-06-14 08:17:10 +00:00
Tao Bao
2ecc50cba4
Merge "Allow sign_target_files_apks.py to create zip64 signed TF.zip." am: 9baf675285
am: 7d5f8ec704
...
am: 5edb6ee6fd
Change-Id: Id342b801dcd112c41235bbf36d18b9ea43ef4d57
2017-06-14 06:25:45 +00:00
Hung-ying Tyan
85507e4a99
Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev am: d9657ef5be
-s ours
...
am: ed4a4a5ada
Change-Id: I19d9cf8a3039cb5099d84e0ee16108a94e39fea1
2017-06-14 06:24:49 +00:00
Bowgo Tsai
b3fdefe4f8
Merge "Align size of vbmeta image to 4k boundary" am: 6b126fb7bc
am: e7151a57aa
...
am: e408b4ceb2
Change-Id: I369e41910ebb55722d4bcb65a5b01445be698482
2017-06-14 06:24:16 +00:00
TreeHugger Robot
d30cf791f6
Merge "resolve merge conflicts of a24fcf6abc
to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
2017-06-14 06:22:14 +00:00
Tao Bao
5edb6ee6fd
Merge "Allow sign_target_files_apks.py to create zip64 signed TF.zip." am: 9baf675285
...
am: 7d5f8ec704
Change-Id: I23d08c4a7b3311afafa857e4efb5a982f8cf0f25
2017-06-14 05:49:58 +00:00
Tao Bao
7d5f8ec704
Merge "Allow sign_target_files_apks.py to create zip64 signed TF.zip."
...
am: 9baf675285
Change-Id: Ic7a9f8735ded10d36d2a97d7b3118bc0ae6f6456
2017-06-14 05:44:56 +00:00
Treehugger Robot
9baf675285
Merge "Allow sign_target_files_apks.py to create zip64 signed TF.zip."
2017-06-14 05:36:51 +00:00
Bowgo Tsai
dd6403d8ff
Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev
...
am: 7f0e79b146
Change-Id: I6c80f285a50facbe1fc44f9a264775206cefcbc1
2017-06-14 04:20:25 +00:00
TreeHugger Robot
7f0e79b146
Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev
2017-06-14 04:13:42 +00:00
SzuWei Lin
35998bb8e5
resolve merge conflicts of a24fcf6abc
to oc-dr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I52993c61a80bc7aee3d49ce37b88413e8f40f832
2017-06-14 11:56:25 +08:00
Hung-ying Tyan
59996eeef3
Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev am: d9657ef5be
-s ours
...
am: 35405d22e5
Change-Id: Ide3bc9a28b9edb5d09f4d8a09dc7bee1c37ce581
2017-06-14 02:32:42 +00:00
Hung-ying Tyan
ed4a4a5ada
Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev
...
am: d9657ef5be
-s ours
Change-Id: Id76f0a2076cca32a6090342a16dddfed070e82de
2017-06-14 02:29:36 +00:00
Hung-ying Tyan
35405d22e5
Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev
...
am: d9657ef5be
-s ours
Change-Id: I91597e28529560d19525a4302fbf69206ebde9c4
2017-06-14 02:29:36 +00:00
Bowgo Tsai
e408b4ceb2
Merge "Align size of vbmeta image to 4k boundary" am: 6b126fb7bc
...
am: e7151a57aa
Change-Id: I0a4dbbe18574e1c2037b185c7e3794033da2c974
2017-06-14 02:14:41 +00:00
Bowgo Tsai
53cf999923
Align size of vbmeta image to 4k boundary
...
Adding option "--padding_size 4096" when making vbmeta.img.
Bug: 38454093
Test: build vbmeta.img and check it's being padded.
Change-Id: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
Merged-In: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
(cherry picked from commit 7cd30041e9
)
2017-06-14 10:14:24 +08:00
Hung-ying Tyan
d9657ef5be
Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev
2017-06-14 02:13:51 +00:00
Bowgo Tsai
e7151a57aa
Merge "Align size of vbmeta image to 4k boundary"
...
am: 6b126fb7bc
Change-Id: Ibf96152b0b1650e33e5d300c05001e84a8253330
2017-06-14 02:10:41 +00:00
Treehugger Robot
6b126fb7bc
Merge "Align size of vbmeta image to 4k boundary"
2017-06-14 02:01:45 +00:00
SzuWei Lin
a24fcf6abc
Merge "Normalize building generic system image with treble-common.mk" into oc-dev-plus-aosp
2017-06-14 01:58:27 +00:00
SzuWei Lin
c60ab6e80e
Merge "Normalize building generic system image with treble-common.mk" into oc-dr1-dev
...
am: 34b018804d
-s ours
Change-Id: I605a82f27a4185326da79c9808485f9e94579221
2017-06-14 01:50:15 +00:00
SzuWei Lin
c8e0da1a9a
Normalize building generic system image with treble-common.mk
...
am: 6fdff23df2
-s ours
Change-Id: Ib756e5c3860de718fb2efecd706175983ca08f27
2017-06-14 01:49:22 +00:00
SzuWei Lin
34b018804d
Merge "Normalize building generic system image with treble-common.mk" into oc-dr1-dev
2017-06-14 01:39:55 +00:00
Tianjie Xu
9cf5d5037e
Merge "Fix duplicate 'META/care_map.txt' when calling add_img_to_target_files" am: 463c25f890
am: fa0542dced
...
am: f5fd565275
Change-Id: I86624d801b85290cd16c3061974a039faec67d2e
2017-06-14 00:38:06 +00:00
Tianjie Xu
f5fd565275
Merge "Fix duplicate 'META/care_map.txt' when calling add_img_to_target_files" am: 463c25f890
...
am: fa0542dced
Change-Id: Ia1d5b0b478f700b4df8ebbf9db10d4035d394792
2017-06-14 00:34:06 +00:00
Tianjie Xu
fa0542dced
Merge "Fix duplicate 'META/care_map.txt' when calling add_img_to_target_files"
...
am: 463c25f890
Change-Id: I926f8cb59b82310f0ace991ac62eacdf47369d3a
2017-06-14 00:31:04 +00:00
Tianjie Xu
463c25f890
Merge "Fix duplicate 'META/care_map.txt' when calling add_img_to_target_files"
2017-06-14 00:19:59 +00:00
Tao Bao
2b8f489e30
Allow sign_target_files_apks.py to create zip64 signed TF.zip.
...
We should only disallow zip64 for the image and OTA zips (because we
don't have zip64 support in libziparchive yet). But target_files zips
are fine to use zip64 with host tools (and we already do that in
add_img_to_target_files.py).
This CL also sets the default compression method to DEFLATED when
creating the signed TF.zip.
Test: sign_target_files.apks.py signing a large TF.zip passes.
Change-Id: I8043739860604134fa1166e920c95c28797bbcc1
2017-06-13 13:01:23 -07:00
Android Build Merger (Role)
7bd6db47a0
Merge "Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev am: 6652dd9005
-s ours am: 9626f4c8a0
-s ours" into oc-dr1-dev-plus-aosp
2017-06-13 19:56:12 +00:00
Dolly Dhariwal
060bd330e3
Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev am: 6652dd9005
...
am: 45e02909d4
-s ours
Change-Id: I7842bbe5c6ad9c695671b6fde977c7463bda81e4
2017-06-13 19:55:44 +00:00
Dolly Dhariwal
9864e51dae
Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev am: 6652dd9005
-s ours
...
am: 9626f4c8a0
-s ours
Change-Id: I7aacc6e13fa28c50080b1df3095366f806a0a09e
2017-06-13 19:55:44 +00:00
Dolly Dhariwal
45e02909d4
Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev
...
am: 6652dd9005
Change-Id: Ibad29c6af59fbf3c53cad5351563a6521f0c29a8
2017-06-13 19:52:46 +00:00
Dolly Dhariwal
9626f4c8a0
Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev
...
am: 6652dd9005
-s ours
Change-Id: Ia25dbed43ba1614276c57756d2c1858614648635
2017-06-13 19:52:44 +00:00
TreeHugger Robot
6652dd9005
Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev
2017-06-13 19:43:02 +00:00
Tianjie Xu
9ac4cb0984
Fix duplicate 'META/care_map.txt' when calling add_img_to_target_files
...
In case the system/vendor image is updated for an A/B target file, we'll
delay the write of META/care_map.txt. Specifically, we'll run "zip -d"
to remove the old entry and then zip in the new one from tmp dir.
Bug: 62345693
Test: Run add_img_to_target_files.py on sailfish target files, and
care_map.txt is updated.
Change-Id: Id2f9997aac50c0740e6944d0d0d43d98f5fc6c29
2017-06-13 11:20:29 -07:00
Jeff Vander Stoep
61f12b185b
Build split file_contexts for recovery am: 4ff042c4aa
...
am: 716b768594
Change-Id: Ib7436c44ca9531dbecb92e4f232d26712af215f7
2017-06-13 18:03:53 +00:00
Jeff Vander Stoep
a0f3fa1640
Build split file_contexts for recovery am: 4ff042c4aa
...
am: 0b3fc37d7e
Change-Id: Id210835c9fb03355688b8a87f8ceed60945d135b
2017-06-13 18:02:39 +00:00
Jeff Vander Stoep
716b768594
Build split file_contexts for recovery
...
am: 4ff042c4aa
Change-Id: I9eff1afef9e427c2e97a64b663a029ef33a8ac4a
2017-06-13 18:00:03 +00:00
Jeff Vander Stoep
0b3fc37d7e
Build split file_contexts for recovery
...
am: 4ff042c4aa
Change-Id: If9ff1b6b2ed152333eeb92a83d9bdbbacc431ed2
2017-06-13 17:59:05 +00:00
Dolly Dhariwal
d5c0238446
Updating the BUILD_ID to OC-DR1 for oc-dr1-dev branch.
...
am: 3e7387a34e
Change-Id: I4730e7277cd94e0f7bafa86b6a7aac9607725635
2017-06-13 17:22:37 +00:00
Jeff Vander Stoep
4ff042c4aa
Build split file_contexts for recovery
...
Bug: 62564629
Test: build and flash marlin. Successfully switch between regular
and recovery modes
Change-Id: I67ae2f59ca1868cfe777de0d4f0c4e3c2d99329d
2017-06-13 15:39:29 +00:00
Dan Willemsen
29c6fa06c9
Merge "Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir" am: cb07cb1aa7
am: cf8ac2a820
...
am: 2bd2a9d630
Change-Id: I9f6ab6d23b44056e1bfac8fbc94f19ab27241366
2017-06-13 15:33:55 +00:00
Dan Willemsen
2bd2a9d630
Merge "Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir" am: cb07cb1aa7
...
am: cf8ac2a820
Change-Id: Ieef27917a409ff8682cb2159341876480b099d4b
2017-06-13 15:29:55 +00:00
Dan Willemsen
cf8ac2a820
Merge "Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir"
...
am: cb07cb1aa7
Change-Id: I984922749f69dad7bb04052655d14ad62316cd8d
2017-06-13 15:25:54 +00:00
Dan Willemsen
cb07cb1aa7
Merge "Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir"
2017-06-13 15:18:57 +00:00
Dolly Dhariwal
3e7387a34e
Updating the BUILD_ID to OC-DR1 for oc-dr1-dev branch.
...
Bug: None
Test: Build and flashed AIO device
Change-Id: I53047dbc0b89c2b3afe5d2af3c0532968f60b893
Merged-In: I796d7490f39f817af8f2ec5bea86593182bfcbe2
2017-06-13 15:14:45 +00:00
Hung-ying Tyan
a6b68e72b1
Revert "Revert "Move /default.prop to /system/etc/prop.default""
...
This reverts commit 88c9dddd0f
.
Bug: 37815285
Bug: 62525809
Test: Tested with ag/2400523 and ag/2400524. Booted pixel phones,
checked the location of prop.default, verified the symlink,
checked a few properties via adb shell and manually tested
a few apps (Camera, Maps etc).
sign_target_files_apks.py was tested with:
sign_target_files_apks -o -e DynamiteLoader.apk= -e DynamiteModulesA.apk= \
-e DynamiteModulesB.apk= -e DynamiteModulesC.apk= -e DynamiteModulesD.apk= \
-e GoogleCertificates.apk= out/dist/*-target_files-*.zip signed-target_files.zip
Booted to recovery and ran 'adb sideload' successfully.
Change-Id: I2ddf287f42360d1a7c7a22f08e7b9e203e7e603a
2017-06-13 21:18:04 +08:00
Dolly Dhariwal
14a9d76026
Updating the BUILD_ID to OC for oc-dev branch.
...
Bug: None
Test: Build and flashed AIO device
Change-Id: I0c87c33b8fb6cbaf71cdb90ce86097bfb31f4137
Merged-In: I53047dbc0b89c2b3afe5d2af3c0532968f60b893
2017-06-13 06:24:35 +00:00