aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-07Merge "releasetools: Remove the obsolete path in GetImage()."android-o-preview-1o-previewTao Bao
2017-03-07Merge "releasetools: Fix two minor issues with _LoadOemDicts()."Tao Bao
2017-03-06releasetools: Remove the obsolete path in GetImage().Tao Bao
We must have created the images (system.img, system.map etc) prior to calling ota_from_target_files.py (added by commit 2e0d8fcf08475cc1aac5ca4f47cd3328a9d8c083, into Lollipop). Remove the obsolete suppport for handling "old" target_files zips that don't have such images. This simplies the logic for BuildSystem() and BuildVendor(), which now would only be called by add_img_to_target_files.py itself. Test: Generating full and incremental OTAs give the same results, w/ and w/o this CL. Change-Id: I0ea243d09d3378249d7982701ae4ec339b04b7b8
2017-03-06Merge "Fix profile dependency"Mathieu Chartier
2017-03-06Fix profile dependencyMathieu Chartier
Otherwise it doesn't work for incremental builds. Bug: 34929159 Bug: 35997300 Test: repo sync && m Change-Id: I78ead57cf89a9d0f26dbf4f3a225a9357bdca1b3
2017-03-06releasetools: Fix two minor issues with _LoadOemDicts().Tao Bao
The first one in WriteVerifyPackage() is mismatching function parameters that can be trivially fixed. The other one is in WriteABOTAPackageWithBrilloScript(), where we don't have edify script instance. Test: `pylint --rcfile=pylintrc ota_from_target_files.py`. Change-Id: Ie238ef5b296dfe9e725b61376992447b662d2376
2017-03-06Merge "Revert "Revert "releasetools: Use pattern filter when unzipping."""Tao Bao
2017-03-05Revert "Revert "releasetools: Use pattern filter when unzipping.""Tao Bao
This reverts commit a7316ce094d4635fa027a99840714af8e579184b. This CL differs from the original CL by not unzipping RADIO/*. This is because: a) AOSP targets don't have RADIO/ entries in the TF.zip; b) we're not using the unzipped RADIO files (but reading them from the zip files directly) - checked all the device-specific releasetools for angler, bullhead, ryu, shamu, volantis, fugu, marlin and sailfish. Test: `m dist` with AOSP targets (tested fugu and bullhead). Change-Id: I4d0c67214ddd6202fc27c71bb79f52b5f4d40c64
2017-03-05Merge "Revert "releasetools: Use pattern filter when unzipping.""Tao Bao
2017-03-05Revert "releasetools: Use pattern filter when unzipping."Tao Bao
This reverts commit aa3a04f19de6b888be7f58d5e8cf37fe2725e949. Reason for revert: Some AOSP targets don't include RADIO/ in the TF.zip. We may possibly skip unzipping RADIO/, or by always creating a dummy RADIO folder in TF.zip. Revert this CL for now. Change-Id: I8e90d322706a4fe82129bdfab5ffa1eab989c648
2017-03-05Merge "Change the default parameter values in common.MakeTempFile()."Tao Bao
2017-03-05Merge "releasetools: Use pattern filter when unzipping."Tao Bao
2017-03-04Merge "Support kernel modules in vendor, recovery images"Treehugger Robot
2017-03-03Support kernel modules in vendor, recovery imagesHoward Chen
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-04Merge "Move profile logic to dex_preopt_odex_install"Mathieu Chartier
2017-03-04Merge "Update product_id and product_version location."Alex Deymo
2017-03-04Merge "Add PRODUCT_IOT to the list of product vars."Alex Deymo
2017-03-03releasetools: Use pattern filter when unzipping.Tao Bao
When building BBOTAs, it only needs *some* unzipped entries in the given target_files zip(s). In particular, it needs 'IMAGES/*', 'META/*', 'RADIO/*'. (It also reads 'SYSTEM/build.prop' and 'OTA/bin/updater', but directly from the zip file.) This CL specifies the entries to unzip. It saves the I/O cost, as well as the temporary storage. Test: ota_from_target_files.py gives the same package w/ and w/o the CL. Test: check_target_files_signatures.py still works. Change-Id: I728428aa0e138879e49f9efbdb46a85892fc7038
2017-03-03Move profile logic to dex_preopt_odex_installMathieu Chartier
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-03Merge "Avoid copying profile"Mathieu Chartier
2017-03-03Merge "Remove DBus support."Sen Jiang
2017-03-03Avoid copying profileMathieu Chartier
We can just use the source profile. Bug: 34929159 Test: m Change-Id: Ibbc0b392052f2a7f76bada13493ca62dc0334ace
2017-03-03Merge "Use ANDROID_LOG_TAGS to filter spammy profman output"Mathieu Chartier
2017-03-03Update product_id and product_version location.Alex Deymo
These files are used by the update console to determine the product associated with a given target_files.zip. Bug: 35804180 Bug: 33211225 Test: `make dist` generates a target_files.zip with these files. Change-Id: I6066da07d76749ae64c26d5f661c7a6d06f3fb3d
2017-03-02Add PRODUCT_IOT to the list of product vars.Alex Deymo
This variable tells whether the product is an Android Things variant of Android. Bug: 32549448 Test: `make dist` on an iot product. Change-Id: I0875951ae57867bc8bf47885e77e494d6284acdb
2017-03-03Merge "Fix for compile error when BUILD_HEADER_LIBRARY is used"Vijay Venkatraman
2017-03-03Merge "Include secilc and sepolicy conditionally, elsewhere"Treehugger Robot
2017-03-02Remove DBus support.Sen Jiang
external/dbus and external/dbus-binding-generator was removed from the manifest. Bug: 31602715 Test: make checkbuild Change-Id: Iea0277720acad8ac0fa630b8745f90fb3c3b5f00
2017-03-03Merge "Add local preopt options for generating app image and profile"Mathieu Chartier
2017-03-02Use ANDROID_LOG_TAGS to filter spammy profman outputMathieu Chartier
Test: mm Bug: 34929159 Change-Id: I794c4a063ab3b4e515ecc20b58a6f985e093fa21
2017-03-02Merge "Enable secondary dex compilation in the background dexopt job"Calin Juravle
2017-03-02Add local preopt options for generating app image and profileMathieu Chartier
If true, LOCAL_DEX_PREOPT_APP_IMAGE cause dex2oat to generate an app image. If true, LOCAL_DEX_PREOPT_GENERATE_PROFILE generates a profile based on a class listing. LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING must be defined in this case. Bug: 34929159 Test: device booting, image loaded (cherry picked from commit 9968fdcd856b33be7d9f3f8067b584823f2d62b4) Change-Id: Ib79ada86a4ac617491723f80d99a3add3d52a7f4
2017-03-02Merge "Do not read the block device when generating the care map"Tianjie Xu
2017-03-02Enable secondary dex compilation in the background dexopt jobCalin Juravle
Test: adb shell cmd package bg-dexopt-job Bug: 32871170 (cherry picked from commit dc308c1b1d3aa00b8dc7da20f02a4fa21bb94281) Change-Id: I21664d5e11dada868dab502498b7c5e598852289 Merged-In: I473e291a26335bd766c8845d2ea28c4f1e45db53
2017-03-02Include secilc and sepolicy conditionally, elsewhereAlex Klyubin
This removes the unconditional inclusion of secilc and sepolicy. These artefacts are now conditionally included by system/core/init. The reason for declaring the conditional inclusion there is because the desired conditional inclusion based on PRODUCT_FULL_TREBLE cannot be declared here because PRODUCT_FULL_TREBLE is not yet available when this file is interpreted. Test: Device boots, no additional SELinux denials. This test is performed on a device with PRODUCT_FULL_TREBLE set to true, and on a device with PRODUCT_FULL_TREBLE set to false. Test: Device with PRODUCT_FULL_TREBLE set to true contains secilc and the three *.cil files, but does not contain the sepolicy file. Device with PRODUCT_FULL_TREBLE set to false contains sepolicy file but does not contain the secilc file or any *.cil files. Bug: 31363362 Change-Id: Ia3f38948b71a054918f5f63c594ba62a033e1066
2017-03-02Fix for compile error when BUILD_HEADER_LIBRARY is usedVijay Venkatraman
Test: include $(BUILD_HEADER_LIBRARY) in Android.mk and compile Change-Id: If720be2d73b1c026961c75b65d82887b5dd41442
2017-03-02Merge "releasetools: Drop the support for fstab_version 1."Treehugger Robot
2017-03-02Do not read the block device when generating the care mapTianjie Xu
This remove the fstab dependency when building the OTA package for marlin/sailfish. Bug: 35811655 Test: OTA package builds successfully for sailfish. Change-Id: If223d11dddca396c47262042c576f9e7d0cb5b33 (cherry picked from commit 7d051adc3be56594ee755bf4ed06b6597fd62268)
2017-03-02Merge "Don't include patch information for dex preopt."Richard Uhler
2017-03-02Merge "Add PRODUCT_FULL_TREBLE."Treehugger Robot
2017-03-02Merge "sintf.xml => manifest.xml"Treehugger Robot
2017-03-01Add PRODUCT_FULL_TREBLE.Steven Moreland
PRODUCT_FULL_TREBLE: whether the device has Treble fully enabled (no passthrough hals, vendor.img, split sepolicy, etc..) PRODUCT_FULL_TREBLE_OVERRIDE: used if someone wants to consider a device as full Treble even if it didn't launch with Android O. Bug: 35809750 Test: PRODUCT_FULL_TREBLE set appropriately with PRODUCT_FULL_TREBLE_OVERRIDE and PRODUCT_SHIPPING_API_LEVEL = 24/25 Change-Id: I069448beaf26c70acb6c45d4228d8fdfe9476410
2017-03-01sintf.xml => manifest.xmlYifan Hong
Bug: 35870239 Test: make -j64 and ensure manifest.xml is there. Change-Id: I5eccc6dcdc04a3caadc3ccce1d8b58c12f5950ee
2017-03-01releasetools: Drop the support for fstab_version 1.Tao Bao
fstab_version is defined by RECOVERY_FSTAB_VERSION in bootable/recovery. We have moved to fstab_version 2 since commit f35d1cef7c19db975a1295e8c23c7fb8bd2489f9 (landed into JB MR2). Drop the support for fstab_version 1, since we won't run the latest OTA script over a JB target_files zip. Test: No impact on building full/incremental OTAs. Change-Id: Ia87c4e7da6c5e71ce0908fca2e4f1ad1c06ba869
2017-03-02Merge "releasetools: Add support for --override_timestamp."Tao Bao
2017-03-01Merge "Fix stacks on 64 bit processes."Treehugger Robot
2017-03-01Fix stacks on 64 bit processes.Josh Gao
debuggerd64 doesn't exist anymore, `debuggerd $PID` works on both 32 and 64 bit processes. Bug: http://b/35872661 Change-Id: I47be05c7ec346e5d657d06e6c3aff1723494639b
2017-03-01Merge "Ship BuiltInPrintService in default repo"Philip P. Moltmann
2017-03-01Merge "releasetools: Merge two identical conditional branches."Treehugger Robot
2017-02-28releasetools: Merge two identical conditional branches.Tao Bao
The merged two branches have become identical since commit fc3422ad3697b5d83adfb69133f66e1623416b18 (landed into Nougat). Test: Get identical incremental packages w/ and w/o the CL. Change-Id: Id1183f8ed83f684a0dac1a4af87b6e075b08aabc
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 05:25:03 +0000