Tao Bao
86839ca639
Merge "releasetools: Drop the support for BBOTA v1 and v2." am: c3e3406125 am: a592924505
...
am: 03c64e425c
2017-03-10 19:39:19 +00:00
Tao Bao
03c64e425c
Merge "releasetools: Drop the support for BBOTA v1 and v2." am: c3e3406125
...
am: a592924505
2017-03-10 19:35:47 +00:00
Tao Bao
a592924505
Merge "releasetools: Drop the support for BBOTA v1 and v2."
...
am: c3e3406125
2017-03-10 19:32:18 +00:00
Tao Bao
85bfe4ac8c
Merge "releasetools: Remove dead functions in EdifyGenerator." am: c87b38f547 am: debedc3343
...
am: dc880f5122
2017-03-09 20:36:48 +00:00
Tao Bao
dc880f5122
Merge "releasetools: Remove dead functions in EdifyGenerator." am: c87b38f547
...
am: debedc3343
2017-03-09 20:34:44 +00:00
Tao Bao
debedc3343
Merge "releasetools: Remove dead functions in EdifyGenerator."
...
am: c87b38f547
2017-03-09 20:31:19 +00:00
Tao Bao
8fad03e771
releasetools: Drop the support for BBOTA v1 and v2.
...
BBOTA v1 and v2 (introduced in L and L MR1 respectively) don't support
resumable OTA. We shouldn't generate packages using v1/v2 at the risk of
bricking devices.
BBOTA v3 (since M) and v4 (since N) both support resumable OTAs. BBOTA
v4 additionally supports using FEC to possibly recover a corrupted
image.
Bug: 33694730
Test: Generate full and incremental OTAs w/ and w/o the CL. They should
give identical packages (in v4).
Change-Id: Ib89d9cd63ba08e8e9aa4131bed18876b89d244c0
2017-03-09 12:25:46 -08:00
Tao Bao
c87b38f547
Merge "releasetools: Remove dead functions in EdifyGenerator."
2017-03-09 20:24:19 +00:00
Tao Bao
f388104eaa
releasetools: Remove dead functions in EdifyGenerator.
...
Remove the following functions that are needed for file-based OTAs only:
- SetPermissions()
- SetPermissionsRecursive()
- MakeSymlinks()
- DeleteFiles()
- DeleteFilesIfNotMatching()
- RenameFiles()
- SkipNextActionIfTargetExists()
Bug: 35853185
Test: Verified there's no reference to these functions.
Change-Id: Iff24a9d705476211effaef28eed2a147fa5fcbce
2017-03-08 16:37:07 -08:00
Steven Moreland
5204bb1ec9
Merge "hardware/interfaces: Android.mk always -Werror" am: df58de6303 am: 05a7a4da70
...
am: 270f3a4778
2017-03-08 23:26:29 +00:00
Steven Moreland
270f3a4778
Merge "hardware/interfaces: Android.mk always -Werror" am: df58de6303
...
am: 05a7a4da70
2017-03-08 23:23:29 +00:00
Steven Moreland
05a7a4da70
Merge "hardware/interfaces: Android.mk always -Werror"
...
am: df58de6303
2017-03-08 23:20:58 +00:00
Treehugger Robot
df58de6303
Merge "hardware/interfaces: Android.mk always -Werror"
2017-03-08 23:16:35 +00:00
Dan Willemsen
266b2c2f55
Merge changes Ia5ce6870,I155654cd am: c619f99e2f am: 6ffe13f8e7
...
am: 53d64224ab
2017-03-08 20:57:48 +00:00
Dan Willemsen
53d64224ab
Merge changes Ia5ce6870,I155654cd am: c619f99e2f
...
am: 6ffe13f8e7
2017-03-08 20:54:48 +00:00
Dan Willemsen
6ffe13f8e7
Merge changes Ia5ce6870,I155654cd
...
am: c619f99e2f
2017-03-08 20:51:19 +00:00
Dan Willemsen
c619f99e2f
Merge changes Ia5ce6870,I155654cd
...
* changes:
Zip after add_img_to_target_files
Allow add_img_to_target_files to work on a directory
2017-03-08 20:45:56 +00:00
Steven Moreland
324c436084
hardware/interfaces: Android.mk always -Werror
...
Bug: 35840847
Test: pass
Change-Id: I6ebf3f5d279ff405446592cdabaeca9d1fdf6cf9
2017-03-08 16:29:50 +00:00
Sen Jiang
a142eae939
Merge "Put system_version in target_files.zip" am: 3838ae7e9b am: 75a7a591ba
...
am: f1f1266fb1
2017-03-08 03:30:42 +00:00
Sen Jiang
f1f1266fb1
Merge "Put system_version in target_files.zip" am: 3838ae7e9b
...
am: 75a7a591ba
2017-03-08 03:28:11 +00:00
Sen Jiang
75a7a591ba
Merge "Put system_version in target_files.zip"
...
am: 3838ae7e9b
2017-03-08 03:25:41 +00:00
Sen Jiang
9b8e4ca518
Put system_version in target_files.zip
...
Bug: 35364984
Test: m dist
Change-Id: I309acb41eb85de239c4c1718e14d9442ca1b0408
(cherry picked from commit cea4d52d2fee19281e660943129e1ad3bdc51fef)
2017-03-07 17:40:27 -08:00
Dan Willemsen
2a5a34f6bd
Zip after add_img_to_target_files
...
For aosp_marlin (on AOSP), this speeds up target files creation from
~57 seconds to ~15 seconds.
For marlin-userdebug (on internal master), this speeds up target files
creation from ~300 seconds to ~95 seconds.
This does make some minor changes to the resulting target_files zip:
* All of the META files are actually at the beginning of the zip now,
previously the ones created by add_img_to_target_files would be at
the end.
* The images are slightly larger. Go's zip implementation in soong_zip
isn't quite as good as the `zip` tool.
* vendor_filesystem_config.txt isn't present if we're not building a
vendor image.
Test: aosp_marlin target_files zip changes look reasonable
Test: marlin target_files zip changes look reasonable
Test: bullhead target_files zip changes look reasonable
Change-Id: Ia5ce6870b85559d65107c3b94332391b4b43a0ea
2017-03-07 15:28:42 -08:00
Steven Moreland
a971398525
Merge "Add vnod." am: 2b33e46593 am: 0e1913f4ff
...
am: f2d838a52e
2017-03-07 22:08:49 +00:00
Steven Moreland
f2d838a52e
Merge "Add vnod." am: 2b33e46593
...
am: 0e1913f4ff
2017-03-07 22:01:49 +00:00
Steven Moreland
0e1913f4ff
Merge "Add vnod."
...
am: 2b33e46593
2017-03-07 21:59:18 +00:00
Steven Moreland
a2e734d786
Add vnod.
...
Short name for vendorimage-nodeps like snod.
Bug: 33356516
Test: works
Change-Id: Iad62aa5a021d603fa9cebe90f4e28cf09d5d49ae
2017-03-07 12:17:51 -08:00
Mathieu Chartier
a37e9057e6
Merge "Fix profile dependency" am: 4d42fef1db am: 52e0317804
...
am: de8546f31b
2017-03-06 20:32:51 +00:00
Mathieu Chartier
de8546f31b
Merge "Fix profile dependency" am: 4d42fef1db
...
am: 52e0317804
2017-03-06 20:30:20 +00:00
Mathieu Chartier
52e0317804
Merge "Fix profile dependency"
...
am: 4d42fef1db
2017-03-06 20:22:20 +00:00
Mathieu Chartier
fb6c6b38c3
Fix profile dependency
...
Otherwise it doesn't work for incremental builds.
Bug: 34929159
Bug: 35997300
Test: repo sync && m
Change-Id: I78ead57cf89a9d0f26dbf4f3a225a9357bdca1b3
2017-03-06 11:38:49 -08:00
Howard Chen
246e093ba8
Merge "Support kernel modules in vendor, recovery images" am: 2f6c2b44d0
...
am: 8fafc4a830
2017-03-04 03:44:36 +00:00
Howard Chen
8fafc4a830
Merge "Support kernel modules in vendor, recovery images"
...
am: 2f6c2b44d0
2017-03-04 03:41:05 +00:00
Treehugger Robot
2f6c2b44d0
Merge "Support kernel modules in vendor, recovery images"
2017-03-04 03:35:00 +00:00
Howard Chen
adbb9c30d1
Support kernel modules in vendor, recovery images
...
Support BOARD_VENDOR_KERNEL_MODULES which accepts a list of the
kernel module binaries. Binaries listed there are copied to
$(TARGET_OUT_VENDOR)/lib/modules and 'depmod' is executed to generate
the dependencies. BOARD_RECOVERY_KERNEL_MODULES is similarly
implemented to provide a way to specify kernel modules to be copied
to the recovery image.
Bug: 33305644
Test: android master build on marlin and load dummy modules
Merged-In: I0a58a270dbb0d2d38fd089f4abff66e62e14fac1
Change-Id: Ia5f429508ca3d7c77448358e42af6efa98fa8624
2017-03-03 18:35:30 -08:00
Mathieu Chartier
a78b2de55f
Merge "Move profile logic to dex_preopt_odex_install" am: b05880e311 am: bc8f7d7f52
...
am: f0f5bb38c7
2017-03-04 02:33:28 +00:00
Mathieu Chartier
f0f5bb38c7
Merge "Move profile logic to dex_preopt_odex_install" am: b05880e311
...
am: bc8f7d7f52
2017-03-04 02:28:29 +00:00
Mathieu Chartier
bc8f7d7f52
Merge "Move profile logic to dex_preopt_odex_install"
...
am: b05880e311
2017-03-04 02:25:30 +00:00
Mathieu Chartier
b05880e311
Merge "Move profile logic to dex_preopt_odex_install"
2017-03-04 02:21:24 +00:00
Alex Deymo
c9059c9ee9
Merge "Update product_id and product_version location." am: a57a2fd118 am: 4afbddcdf7
...
am: 5393f580b6
2017-03-04 01:56:57 +00:00
Alex Deymo
97180b6754
Merge "Add PRODUCT_IOT to the list of product vars." am: e90295014f am: c4ca4c41f8
...
am: 24428c0dac
2017-03-04 01:56:29 +00:00
Alex Deymo
5393f580b6
Merge "Update product_id and product_version location." am: a57a2fd118
...
am: 4afbddcdf7
2017-03-04 01:53:58 +00:00
Alex Deymo
24428c0dac
Merge "Add PRODUCT_IOT to the list of product vars." am: e90295014f
...
am: c4ca4c41f8
2017-03-04 01:53:29 +00:00
Alex Deymo
4afbddcdf7
Merge "Update product_id and product_version location."
...
am: a57a2fd118
2017-03-04 01:51:25 +00:00
Alex Deymo
c4ca4c41f8
Merge "Add PRODUCT_IOT to the list of product vars."
...
am: e90295014f
2017-03-04 01:51:00 +00:00
Alex Deymo
a57a2fd118
Merge "Update product_id and product_version location."
2017-03-04 01:46:21 +00:00
Alex Deymo
e90295014f
Merge "Add PRODUCT_IOT to the list of product vars."
2017-03-04 01:46:06 +00:00
Steve Muckle
13f5f6adfa
Merge "Support kernel modules in vendor, recovery images"
2017-03-04 00:47:15 +00:00
Mathieu Chartier
2ac264fe13
Move profile logic to dex_preopt_odex_install
...
It is not necessary to have it in setup_one_odex since the profile is
the same for multilib.
Prevents errors related to using ../ in profile path resulting in not
having a directory.
Bug: 34929159
Test: m
Change-Id: Ifdcba119f3599b0c80e27594781db5e4d64bd473
2017-03-03 16:23:14 -08:00
Mathieu Chartier
b4c0efffae
Merge "Avoid copying profile" am: c2159fd5b6 am: ab70e664c3
...
am: d9b318e6b5
2017-03-03 22:47:46 +00:00
